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
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
The Android Automerger
7ba1cf287f
Merge branch 'gingerbread' into gingerbread-release
2010-08-26 08:14:14 -07:00
Jean-Baptiste Queru
33462598d8
am bea98acf: reconcile open-source froyo into google variant
...
Merge commit 'bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread
* commit 'bea98acfa2253796aeade605c7020a7cc942af41':
Explicitly enable backup by default in SDK builds
2010-08-25 10:13:14 -07:00
Brad Fitzpatrick
06bcd70560
Quiet harmless StrictMode violations caused by the Monkey.
...
The monkey writes to System.out which is effectively a file and is
caught by StrictMode.
BUG=2947447
Change-Id: Iab38917f18baa319dad34d0c788bc9a10a041796
2010-08-25 09:45:49 -07:00
Jean-Baptiste Queru
bea98acfa2
reconcile open-source froyo into google variant
...
Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039
2010-08-25 09:37:34 -07:00
Christopher Tate
b668245cf1
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-25 08:28:07 -07:00
The Android Automerger
8554d7274b
Merge branch 'gingerbread' into gingerbread-release
2010-08-25 08:27:57 -07:00
Yu Shan Emily Lau
27d0ec1e87
Merge "Add the new option for the scripted monkey profile testing." into gingerbread
2010-08-24 20:08:29 -07:00
Brian Carlstrom
4a1b80c386
Merge "Added a couple of new properties." into gingerbread
2010-08-24 19:58:19 -07:00
Yu Shan Emily Lau
6035a57a97
Add the new option for the scripted monkey profile testing.
...
Change-Id: I1013a1a0daed948f509d9a29077f0e282baf1a10
2010-08-24 19:49:38 -07:00
Christopher Tate
c37018a7c4
am ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
...
Merge commit 'ddc026b1d5633348d97d78477ff1c7c950c3f3a8' into gingerbread
* commit 'ddc026b1d5633348d97d78477ff1c7c950c3f3a8':
Explicitly enable backup by default in SDK builds
2010-08-24 18:19:19 -07:00
Christopher Tate
ddc026b1d5
Merge "Explicitly enable backup by default in SDK builds" into froyo
2010-08-24 18:04:35 -07:00
Brian Carlstrom
d275b6237e
Added a couple of new properties.
...
The Android framework crashes with an int parsing failure and then
spins wildly if it can't find an expected property.
(git cherry-pick -e d88ee455)
Change-Id: Ie33e0261185301e6ce41b0896f9916816db9f928
2010-08-24 18:02:43 -07:00
Christopher Tate
cc6ed7bd92
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-24 13:24:48 -07:00
The Android Automerger
d25e0f9dab
Merge branch 'gingerbread' into gingerbread-release
2010-08-20 08:22:41 -07:00
Yu Shan Emily Lau
3307fdcce1
Merge "Added the new keyword tap for the scripted monkey." into gingerbread
2010-08-19 15:46:51 -07:00
Yu Shan Emily Lau
39b0199222
Added the new keyword tap for the scripted monkey.
...
Change-Id: Iabfc462f8fc853b3235aa0d742fa46c97e980b77
2010-08-19 15:01:38 -07:00
The Android Automerger
2f8dc7db34
Merge branch 'gingerbread' into gingerbread-release
2010-08-19 12:42:25 -07:00