The Android Automerger
ecb7b3b2b6
Merge branch 'gingerbread' into gingerbread-release
2010-09-30 07:10:54 -07:00
Kenny Root
12c86756b9
Merge "Add OBB usage example" into gingerbread
2010-09-29 17:19:14 -07:00
Kenny Root
b9e80e74e2
Add OBB usage example
...
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
2010-09-29 16:18:08 -07:00
Eric Fischer
f4578730bf
Genericize strings with SD card references.
...
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
2010-09-29 10:56:20 -07:00
The Android Automerger
516bb386c0
Merge branch 'gingerbread' into gingerbread-release
2010-09-27 07:36:41 -07:00
Jean-Baptiste Queru
7159b406ef
reconcile froyo-release into gingerbread
...
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
2010-09-26 17:28:54 -07:00
The Android Automerger
9cd53761ec
Merge branch 'gingerbread' into gingerbread-release
2010-09-26 12:36:26 -07:00
David 'Digit' Turner
be57246603
Merge "Update prebuilt library test." into gingerbread
2010-09-24 01:12:54 -07:00
Dianne Hackborn
d424b8d9cc
Prepare for a new IActivityController method.
...
Change-Id: I30823fe0c06aef35a2773760ec938e7979cd1037
2010-09-23 14:51:56 -07:00
David 'Digit' Turner
1f0003f57d
Merge "Unify NDK platform headers." into gingerbread
2010-09-23 07:35:51 -07:00
David 'Digit' Turner
7012117d4a
Unify NDK platform headers.
...
This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:
- common headers: android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs: android-N/arch-A/usr/lib --> android-N/arch-A/lib
Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276
NOTE: This also contains careful separation of API-level-specific headers.
For example, platforms/android-5/include/pthread.h contains new function
declarations that are not available when using platforms/android-3/include/pthread.h
NOTE: The NDK's build-platforms.sh script has been updated to understand the new
layout. This change in develeopment/ndk does not change the layout of
platform files under $NDK/platforms after build-platforms.sh is called.
2010-09-22 18:04:36 +02:00
The Android Automerger
e6fa367ebc
Merge branch 'gingerbread' into gingerbread-release
2010-09-22 07:12:08 -07:00
David 'Digit' Turner
2068cc393b
Update prebuilt library test.
...
This is to reflect the simplification in prebuilt support.
1/ LOCAL_SRC_FILES is relative to LOCAL_PATH, like with other module types
2/ no need for LOCAL_PREBUILTS
Change-Id: If7302fe355cb25a446e31c20015098db75c00c02
2010-09-22 15:11:57 +02:00
Brett Chabot
14282f9796
Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
2010-09-21 14:28:26 -07:00
Andy Stadler
9b2d35f0a8
DO NOT MERGE Classpath cleanup in libcore
...
* libcore/security no longer exists
* many other dirs under libcore had no java code
Change-Id: I1fcfda6ce769e0d9fbd4893c46bbded586c78251
2010-09-21 14:07:22 -07:00
Brett Chabot
fb0b7c06a7
Change hosttestlib to use ddm-prebuilt.
...
Change-Id: I9124f34e6ba5559afc9a4bf9b5c70690385db11a
2010-09-21 11:44:23 -07:00
The Android Automerger
7f6880bdd3
Merge branch 'gingerbread' into gingerbread-release
2010-09-17 17:28:08 -07:00
Andy Stadler
97903767d3
Cleanups for eclipse classpath DO NOT MERGE
...
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
2010-09-17 15:59:20 -07:00
The Android Automerger
f972446f56
Merge branch 'gingerbread' into gingerbread-release
2010-09-15 07:11:34 -07:00
Jeff Brown
2405e67fad
Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread
2010-09-14 15:27:41 -07:00
The Android Automerger
2963322578
Merge branch 'gingerbread' into gingerbread-release
2010-09-14 08:24:50 -07:00
Jeff Brown
9f44e97108
Update NDK headers and samples to sync up with looper API changes.
...
Change-Id: I7082603bf280888be90dc4df687521aaae9b1d02
2010-09-14 02:02:15 -07:00
Megha Joshi
3471dafa11
am 42d3a4ae: Adding CrossCompatibility sample app.
...
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread
* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
Adding CrossCompatibility sample app.
2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14
Adding CrossCompatibility sample app.
...
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
2010-09-13 17:00:10 -07:00
The Android Automerger
a71a46d821
Merge branch 'gingerbread' into gingerbread-release
2010-09-13 07:49:08 -07:00
Trevor Johns
12d3ad89e4
am e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
...
Merge commit 'e55fc016a6e40edd456c0d240d06689d84a7127b' into gingerbread
* commit 'e55fc016a6e40edd456c0d240d06689d84a7127b':
Use remote_api for shell access on developer.android.com.
2010-09-10 12:33:57 -07:00
Trevor Johns
e55fc016a6
Merge "Use remote_api for shell access on developer.android.com." into froyo
2010-09-10 12:23:09 -07:00
Trevor Johns
5e100c67f3
Use remote_api for shell access on developer.android.com.
...
This allows Python shell access on developer.android.com
using the remote_api_shell.py script that's bundled with
the App Engine SDK.
Change-Id: If3c979ccbf885905a9cc3840645dcb6a5a50cfa8
2010-09-10 11:26:50 -07:00
The Android Automerger
11d56eb8f3
Merge branch 'gingerbread' into gingerbread-release
2010-09-08 18:08:23 -07:00
Jeff Brown
ff242db867
Merge "Add samples for secure views." into gingerbread
2010-09-08 11:53:13 -07:00
The Android Automerger
8d40ccdfb8
Merge branch 'gingerbread' into gingerbread-release
2010-09-08 08:25:14 -07:00
Dianne Hackborn
d3d58cf7d3
Update to follow ALooper ident change.
...
Also the native-activity sample also has some very simple code showing
how to listen to the accelerometer.
Change-Id: I0629b8bc40cddd66233c1675cd5e8b42a9b722d8
2010-09-07 15:47:35 -07:00
Jeff Brown
cf4db94885
Add samples for secure views.
...
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
2010-09-07 13:04:15 -07:00
Joe Onorato
7d26cd1982
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
...
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
2010-09-07 12:03:48 -04:00
The Android Automerger
059c6d8977
Merge branch 'gingerbread' into gingerbread-release
2010-09-03 16:03:12 -07:00
Dianne Hackborn
23bff5dd80
Add API demo for picking a contact with a permission grant.
...
Change-Id: I9b0659e18afb19f8050cb77104c41ea291a9e3c7
2010-09-02 11:21:05 -07:00
The Android Automerger
b62b9b91ec
Merge branch 'gingerbread' into gingerbread-release
2010-09-01 19:50:09 -07:00
Xavier Ducrohet
b7d3c175e2
Merge "New SDK architecture. DO NOT MERGE." into gingerbread
2010-09-01 16:48:59 -07:00
The Android Automerger
2590e2eef9
Merge branch 'gingerbread' into gingerbread-release
2010-08-31 08:14:15 -07:00
Xavier Ducrohet
3aecc4de01
New SDK architecture. DO NOT MERGE.
...
tools normally under the platform, move to a single location
called platform-tools/
Change-Id: I70659167778303722acb107a2d04bbf01467f884
2010-08-30 16:01:45 -07:00
Yu Shan Emily Lau
67aad2d8d5
Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
2010-08-30 15:52:59 -07:00
Yu Shan Emily Lau
6a6c533129
Add the simple script log for the statbility stress test.
...
Add the randomize script option.
Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
2010-08-30 15:31:33 -07:00
The Android Automerger
5f6fd9ce50
Merge branch 'gingerbread' into gingerbread-release
2010-08-30 08:59:39 -07:00
Dianne Hackborn
562306ecd8
Fix build.
...
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
2010-08-27 17:00:52 -07:00
Christopher Tate
f36c4e1236
Explicitly enable backup by default in SDK builds
...
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
2010-08-27 08:24:52 -07:00
Derek Sollenberger
704da60406
Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
2010-08-27 07:43:54 -07:00
Derek Sollenberger
48c0834ab5
Disable Proguard for the SampleBrowerPlugin
...
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.
Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
2010-08-27 10:40:51 -04:00
Yu Shan Emily Lau
ea7d6e8e65
Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
2010-08-26 15:17:36 -07:00
Dianne Hackborn
4f410fb5bf
Update to follow API.
...
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
2010-08-26 14:38:20 -07:00
Yu Shan Emily Lau
9ab015751d
Add the new option for the device sleep time. This is only for the scripted monkey.
...
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
2010-08-26 14:18:18 -07:00