OSDN Git Service
Nick Kralevich [Fri, 1 Oct 2010 17:48:35 +0000 (10:48 -0700)]
am
11e191b1: Merge "update required permissions." into gingerbread
Merge commit '
11e191b197c97fe1512f6b630bac9a642eb2ffdb' into gingerbread-plus-aosp
* commit '
11e191b197c97fe1512f6b630bac9a642eb2ffdb':
update required permissions.
Ying Wang [Fri, 1 Oct 2010 17:48:30 +0000 (10:48 -0700)]
am
45550faa: Merge "Don\'t send non-existent system keys." into gingerbread
Merge commit '
45550faad0f683d1393ea20144246ed43fc19899' into gingerbread-plus-aosp
* commit '
45550faad0f683d1393ea20144246ed43fc19899':
Don't send non-existent system keys.
Jeff Brown [Thu, 30 Sep 2010 03:51:48 +0000 (20:51 -0700)]
resolved conflicts for merge of
4110368b to gingerbread-plus-aosp
Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137
Nick Kralevich [Fri, 1 Oct 2010 16:44:27 +0000 (09:44 -0700)]
Merge "update required permissions." into gingerbread
Ying Wang [Fri, 1 Oct 2010 16:42:13 +0000 (09:42 -0700)]
Merge "Don't send non-existent system keys." into gingerbread
Nick Kralevich [Fri, 1 Oct 2010 16:30:20 +0000 (09:30 -0700)]
update required permissions.
Change-Id: I49fb855c62aa1a11c8cbf7645aa4dbe2fa18faf3
Jeff Brown [Thu, 30 Sep 2010 22:58:59 +0000 (15:58 -0700)]
Merge "Improve touch paint sample to use geometrical touch width." into gingerbread
Jeff Brown [Thu, 30 Sep 2010 03:51:48 +0000 (20:51 -0700)]
Improve touch paint sample to use geometrical touch width.
Added multitouch support.
Fixed the trackball based drawing.
Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
Nick Kralevich [Thu, 30 Sep 2010 22:21:49 +0000 (15:21 -0700)]
am
c70ceb23: initial checkin. Needs lots of love.
Merge commit '
c70ceb2363a444680aa17c8dcefbf8075e83cc91' into gingerbread-plus-aosp
* commit '
c70ceb2363a444680aa17c8dcefbf8075e83cc91':
initial checkin. Needs lots of love.
Nick Kralevich [Thu, 30 Sep 2010 21:14:17 +0000 (14:14 -0700)]
initial checkin. Needs lots of love.
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
Xavier Ducrohet [Thu, 30 Sep 2010 20:20:12 +0000 (13:20 -0700)]
am
76afc004: Integrate sdk.atree changes from DO NOT MERGE
Merge commit '
76afc004df452384cfd00137a59c7a3e0502ff75' into gingerbread-plus-aosp
* commit '
76afc004df452384cfd00137a59c7a3e0502ff75':
Integrate sdk.atree changes from master. DO NOT MERGE
Xavier Ducrohet [Mon, 27 Sep 2010 20:58:45 +0000 (13:58 -0700)]
Integrate sdk.atree changes from DO NOT MERGE
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree
Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
Kenny Root [Thu, 30 Sep 2010 17:09:11 +0000 (10:09 -0700)]
am
12c86756: Merge "Add OBB usage example" into gingerbread
Merge commit '
12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp
* commit '
12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
Add OBB usage example
Xavier Ducrohet [Thu, 30 Sep 2010 15:52:23 +0000 (08:52 -0700)]
am
682ec293: Split the tools component from sdk.atree
Merge commit '
682ec293359cf4ac8c61df25bb05519b604b17eb' into gingerbread-plus-aosp
* commit '
682ec293359cf4ac8c61df25bb05519b604b17eb':
Split the tools component from sdk.atree
Kenny Root [Thu, 30 Sep 2010 00:19:14 +0000 (17:19 -0700)]
Merge "Add OBB usage example" into gingerbread
Kenny Root [Tue, 10 Aug 2010 00:25:00 +0000 (17:25 -0700)]
Add OBB usage example
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
Ying Wang [Wed, 29 Sep 2010 01:26:18 +0000 (18:26 -0700)]
Don't send non-existent system keys.
Send only if the system key physically exists.
Change-Id: I8fa102db679c55e5bfba1c9a68ecf2bc196021cd
Eric Fischer [Wed, 29 Sep 2010 19:49:20 +0000 (12:49 -0700)]
am
f4578730: Genericize strings with SD card references.
Merge commit '
f4578730bf95574f417fc2cee979bdc980cd02a8' into gingerbread-plus-aosp
* commit '
f4578730bf95574f417fc2cee979bdc980cd02a8':
Genericize strings with SD card references.
Eric Fischer [Tue, 28 Sep 2010 23:31:58 +0000 (16:31 -0700)]
Genericize strings with SD card references.
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
Xavier Ducrohet [Mon, 27 Sep 2010 22:53:27 +0000 (15:53 -0700)]
Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.
Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
Xavier Ducrohet [Mon, 27 Sep 2010 23:44:55 +0000 (16:44 -0700)]
am
64e53fe5: Merge "Move adb to the platform-tools."
Merge commit '
64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp
* commit '
64e53fe5dd1d884eabe5e6160d69afa47038d77b':
Move adb to the platform-tools.
Raphael Moll [Mon, 27 Sep 2010 23:44:40 +0000 (16:44 -0700)]
am
2f613967: Move adb to the platform-tools (windows SDK part).
Merge commit '
2f613967a0c4a579370ff498c8461abee4978fc7' into gingerbread-plus-aosp
* commit '
2f613967a0c4a579370ff498c8461abee4978fc7':
Move adb to the platform-tools (windows SDK part).
Xavier Ducrohet [Mon, 27 Sep 2010 23:24:25 +0000 (16:24 -0700)]
Merge "Move adb to the platform-tools."
Raphael Moll [Mon, 27 Sep 2010 23:20:07 +0000 (16:20 -0700)]
Move adb to the platform-tools (windows SDK part).
This is the Win SDK counterpart to Change I4c2a11c1.
Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
Xavier Ducrohet [Mon, 27 Sep 2010 20:58:45 +0000 (13:58 -0700)]
Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK
Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:39:26 +0000 (17:39 -0700)]
am
7159b406: reconcile froyo-release into gingerbread
Merge commit '
7159b406efb7533f022cbe0bd2d855eb6a52cfe1' into gingerbread-plus-aosp
* commit '
7159b406efb7533f022cbe0bd2d855eb6a52cfe1':
Explicitly enable backup by default in SDK builds
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:28:54 +0000 (17:28 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
David 'Digit' Turner [Fri, 24 Sep 2010 08:15:20 +0000 (01:15 -0700)]
am
be572466: Merge "Update prebuilt library test." into gingerbread
Merge commit '
be57246603d3f6286dc6763a089daf5c1387de55' into gingerbread-plus-aosp
* commit '
be57246603d3f6286dc6763a089daf5c1387de55':
Update prebuilt library test.
David 'Digit' Turner [Fri, 24 Sep 2010 08:12:54 +0000 (01:12 -0700)]
Merge "Update prebuilt library test." into gingerbread
Dianne Hackborn [Thu, 23 Sep 2010 23:02:22 +0000 (16:02 -0700)]
am
d424b8d9: Prepare for a new IActivityController method.
Merge commit '
d424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp
* commit '
d424b8d9ccb569c4a2f01de248068fd130e3bd82':
Prepare for a new IActivityController method.
Dianne Hackborn [Thu, 23 Sep 2010 21:48:24 +0000 (14:48 -0700)]
Prepare for a new IActivityController method.
Change-Id: I30823fe0c06aef35a2773760ec938e7979cd1037
David 'Digit' Turner [Thu, 23 Sep 2010 15:25:36 +0000 (08:25 -0700)]
am
1f0003f5: Merge "Unify NDK platform headers." into gingerbread
Merge commit '
1f0003f57da3f9805af9ab883d5255be58cf4439' into gingerbread-plus-aosp
* commit '
1f0003f57da3f9805af9ab883d5255be58cf4439':
Unify NDK platform headers.
David 'Digit' Turner [Thu, 23 Sep 2010 14:35:51 +0000 (07:35 -0700)]
Merge "Unify NDK platform headers." into gingerbread
David 'Digit' Turner [Wed, 22 Sep 2010 16:04:36 +0000 (18:04 +0200)]
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.
David 'Digit' Turner [Wed, 22 Sep 2010 13:11:57 +0000 (15:11 +0200)]
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
Brett Chabot [Tue, 21 Sep 2010 21:33:11 +0000 (14:33 -0700)]
am
14282f97: Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
Merge commit '
14282f9796f888c3388d25a878b625fd76840212' into gingerbread-plus-aosp
* commit '
14282f9796f888c3388d25a878b625fd76840212':
Change hosttestlib to use ddm-prebuilt.
Andy Stadler [Tue, 21 Sep 2010 21:28:58 +0000 (14:28 -0700)]
am
9b2d35f0: DO NOT MERGE Classpath cleanup in libcore
Merge commit '
9b2d35f0a81cb0483337ab0a776c5e9287e84dbf' into gingerbread-plus-aosp
* commit '
9b2d35f0a81cb0483337ab0a776c5e9287e84dbf':
DO NOT MERGE Classpath cleanup in libcore
Brett Chabot [Tue, 21 Sep 2010 21:28:26 +0000 (14:28 -0700)]
Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
Andy Stadler [Tue, 21 Sep 2010 21:07:22 +0000 (14:07 -0700)]
DO NOT MERGE Classpath cleanup in libcore
* libcore/security no longer exists
* many other dirs under libcore had no java code
Change-Id: I1fcfda6ce769e0d9fbd4893c46bbded586c78251
Brett Chabot [Wed, 28 Jul 2010 00:57:38 +0000 (17:57 -0700)]
Change hosttestlib to use ddm-prebuilt.
Change-Id: I9124f34e6ba5559afc9a4bf9b5c70690385db11a
Andy Stadler [Sat, 18 Sep 2010 02:16:26 +0000 (19:16 -0700)]
resolved conflicts for merge of
97903767 to gingerbread-plus-aosp
Change-Id: Ic71831342d8e7d548b3d082a97486b40e0636994
Andy Stadler [Fri, 17 Sep 2010 22:59:20 +0000 (15:59 -0700)]
Cleanups for eclipse classpath DO NOT MERGE
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
Xavier Ducrohet [Fri, 17 Sep 2010 21:31:47 +0000 (14:31 -0700)]
am
d5964750: Package Proguard with the SDK.
Merge commit '
d59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp
* commit '
d59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
Package Proguard with the SDK.
Xavier Ducrohet [Wed, 15 Sep 2010 23:58:16 +0000 (16:58 -0700)]
Package Proguard with the SDK.
Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
Jeff Brown [Tue, 14 Sep 2010 22:30:01 +0000 (15:30 -0700)]
am
2405e67f: Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread
Merge commit '
2405e67fad64b62efa71f04aab712fd9d80803df' into gingerbread-plus-aosp
* commit '
2405e67fad64b62efa71f04aab712fd9d80803df':
Update NDK headers and samples to sync up with looper API changes.
Jeff Brown [Tue, 14 Sep 2010 22:27:41 +0000 (15:27 -0700)]
Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread
Jeff Brown [Tue, 14 Sep 2010 06:57:28 +0000 (23:57 -0700)]
Update NDK headers and samples to sync up with looper API changes.
Change-Id: I7082603bf280888be90dc4df687521aaae9b1d02
Megha Joshi [Tue, 14 Sep 2010 00:43:01 +0000 (17:43 -0700)]
am
3471dafa: am
42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '
3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp
* commit '
3471dafa11b721ae4510cb182e3d54033faed12d':
Adding CrossCompatibility sample app.
Megha Joshi [Tue, 14 Sep 2010 00:38:43 +0000 (17:38 -0700)]
am
42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '
42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread
* commit '
42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
Adding CrossCompatibility sample app.
Megha Joshi [Tue, 17 Aug 2010 20:56:59 +0000 (13:56 -0700)]
Adding CrossCompatibility sample app.
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
Vairavan Srinivasan [Fri, 10 Sep 2010 22:41:59 +0000 (15:41 -0700)]
am
50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '
50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp
* commit '
50d579d0ec9c9d0bcd3da936af8480808d5e0843':
GlobalTime: Perform Zoom In and Out only after initialization
Trevor Johns [Fri, 10 Sep 2010 19:38:04 +0000 (12:38 -0700)]
am
12d3ad89: am
e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit '
12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d' into gingerbread-plus-aosp
* commit '
12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d':
Use remote_api for shell access on developer.android.com.
Trevor Johns [Fri, 10 Sep 2010 19:33:57 +0000 (12:33 -0700)]
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.
Trevor Johns [Fri, 10 Sep 2010 19:23:09 +0000 (12:23 -0700)]
Merge "Use remote_api for shell access on developer.android.com." into froyo
Trevor Johns [Fri, 10 Sep 2010 18:26:50 +0000 (11:26 -0700)]
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
Jeff Brown [Wed, 8 Sep 2010 18:57:59 +0000 (11:57 -0700)]
am
ff242db8: Merge "Add samples for secure views." into gingerbread
Merge commit '
ff242db8670695e946400d957a82d2933e7e01a1' into gingerbread-plus-aosp
* commit '
ff242db8670695e946400d957a82d2933e7e01a1':
Add samples for secure views.
Jeff Brown [Wed, 8 Sep 2010 18:53:13 +0000 (11:53 -0700)]
Merge "Add samples for secure views." into gingerbread
Vairavan Srinivasan [Wed, 8 Sep 2010 02:13:46 +0000 (19:13 -0700)]
GlobalTime: Perform Zoom In and Out only after initialization
Invoking zoom on mGLView before initialization causes Null pointer
exception. The usecase is to launch global time and immediately
press key 2 or 8 (just before the globe is seen on display).
Change-Id: I10e7736527a934029364c9c83f147f94574f5488
Dianne Hackborn [Tue, 7 Sep 2010 23:36:39 +0000 (16:36 -0700)]
am
d3d58cf7: Update to follow ALooper ident change.
Merge commit '
d3d58cf7d3a508bb855c2ad626205ddcbb3bd237' into gingerbread-plus-aosp
* commit '
d3d58cf7d3a508bb855c2ad626205ddcbb3bd237':
Update to follow ALooper ident change.
Dianne Hackborn [Tue, 7 Sep 2010 22:30:07 +0000 (15:30 -0700)]
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
Jeff Brown [Fri, 3 Sep 2010 17:19:28 +0000 (10:19 -0700)]
Add samples for secure views.
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
Joe Onorato [Tue, 7 Sep 2010 18:39:40 +0000 (11:39 -0700)]
am
7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '
7d26cd198266cd48cb0a912585419fbe0cc8ed89' into gingerbread-plus-aosp
* commit '
7d26cd198266cd48cb0a912585419fbe0cc8ed89':
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Joe Onorato [Tue, 7 Sep 2010 15:53:18 +0000 (11:53 -0400)]
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
Dianne Hackborn [Thu, 2 Sep 2010 21:49:25 +0000 (14:49 -0700)]
am
23bff5dd: Add API demo for picking a contact with a permission grant.
Merge commit '
23bff5dd80c782ac6d4f67caa57230f265fca77e' into gingerbread-plus-aosp
* commit '
23bff5dd80c782ac6d4f67caa57230f265fca77e':
Add API demo for picking a contact with a permission grant.
Dianne Hackborn [Thu, 2 Sep 2010 05:58:26 +0000 (22:58 -0700)]
Add API demo for picking a contact with a permission grant.
Change-Id: I9b0659e18afb19f8050cb77104c41ea291a9e3c7
Xavier Ducrohet [Wed, 1 Sep 2010 23:53:40 +0000 (16:53 -0700)]
am
b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Merge commit '
b7d3c175e25143cb75199d4e62418df5bc2e413b' into gingerbread-plus-aosp
* commit '
b7d3c175e25143cb75199d4e62418df5bc2e413b':
New SDK architecture. DO NOT MERGE.
Xavier Ducrohet [Wed, 1 Sep 2010 23:48:59 +0000 (16:48 -0700)]
Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Xavier Ducrohet [Sat, 28 Aug 2010 01:47:51 +0000 (18:47 -0700)]
New SDK architecture. DO NOT MERGE.
tools normally under the platform, move to a single location
called platform-tools/
Change-Id: I70659167778303722acb107a2d04bbf01467f884
Yu Shan Emily Lau [Mon, 30 Aug 2010 22:56:38 +0000 (15:56 -0700)]
am
67aad2d8: Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
Merge commit '
67aad2d8d51e9d48730f0c6e4848c60b1a9d0798' into gingerbread-plus-aosp
* commit '
67aad2d8d51e9d48730f0c6e4848c60b1a9d0798':
Add the simple script log for the statbility stress test.
Yu Shan Emily Lau [Mon, 30 Aug 2010 22:52:59 +0000 (15:52 -0700)]
Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
Yu Shan Emily Lau [Fri, 27 Aug 2010 06:00:06 +0000 (23:00 -0700)]
Add the simple script log for the statbility stress test.
Add the randomize script option.
Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
Jean-Baptiste Queru [Mon, 30 Aug 2010 17:33:39 +0000 (10:33 -0700)]
am
d9380caf: Merge "Make runtest --path smarter when choosing path to build."
Merge commit '
d9380caf410ddf4b17a6e5035a89851bc58408f7' into gingerbread-plus-aosp
* commit '
d9380caf410ddf4b17a6e5035a89851bc58408f7':
Make runtest --path smarter when choosing path to build.
Jean-Baptiste Queru [Mon, 30 Aug 2010 17:25:04 +0000 (10:25 -0700)]
am
be97ad65: Merge "Replaced deprecated Contacts Api with ContactsContract"
Merge commit '
be97ad655dedb392caa06ccc6c528b37ba5169fb' into gingerbread-plus-aosp
* commit '
be97ad655dedb392caa06ccc6c528b37ba5169fb':
Replaced deprecated Contacts Api with ContactsContract
Jean-Baptiste Queru [Mon, 30 Aug 2010 16:10:24 +0000 (09:10 -0700)]
Merge "Make runtest --path smarter when choosing path to build."
Jean-Baptiste Queru [Mon, 30 Aug 2010 16:04:19 +0000 (09:04 -0700)]
Merge "Replaced deprecated Contacts Api with ContactsContract"
Xavier Ducrohet [Sat, 28 Aug 2010 02:41:51 +0000 (19:41 -0700)]
am
420b59fe: Fix windows SDK build.
Merge commit '
420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp
* commit '
420b59fe215f8a912e66759d1c4a252bea3df39d':
Fix windows SDK build.
Xavier Ducrohet [Sat, 28 Aug 2010 02:30:38 +0000 (19:30 -0700)]
Fix windows SDK build.
Location of hierarchyviewer is now in hierarchyviewer2/app/etc
Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
Dianne Hackborn [Sat, 28 Aug 2010 00:03:48 +0000 (17:03 -0700)]
Dianne Hackborn [Sat, 28 Aug 2010 00:00:52 +0000 (17:00 -0700)]
Fix build.
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
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
Derek Sollenberger [Fri, 27 Aug 2010 14:45:43 +0000 (07:45 -0700)]
am
704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Merge commit '
704da60406d259c5a3bfe273755861f80575d7ca' into gingerbread-plus-aosp
* commit '
704da60406d259c5a3bfe273755861f80575d7ca':
Disable Proguard for the SampleBrowerPlugin
Derek Sollenberger [Fri, 27 Aug 2010 14:43:54 +0000 (07:43 -0700)]
Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Derek Sollenberger [Fri, 27 Aug 2010 14:34:18 +0000 (10:34 -0400)]
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
Yu Shan Emily Lau [Thu, 26 Aug 2010 22:27:57 +0000 (15:27 -0700)]
am
ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
Merge commit '
ea7d6e8e6568b777693c52183e9abf973786a6b5' into gingerbread-plus-aosp
* commit '
ea7d6e8e6568b777693c52183e9abf973786a6b5':
Add the new option for the device sleep time. This is only for the scripted monkey.
Yu Shan Emily Lau [Thu, 26 Aug 2010 22:17:36 +0000 (15:17 -0700)]
Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
Dianne Hackborn [Thu, 26 Aug 2010 21:46:30 +0000 (14:46 -0700)]
am
4f410fb5: Update to follow API.
Merge commit '
4f410fb5bfe0bad4760610b771edb33300470041' into gingerbread-plus-aosp
* commit '
4f410fb5bfe0bad4760610b771edb33300470041':
Update to follow API.
Dianne Hackborn [Thu, 26 Aug 2010 21:38:20 +0000 (14:38 -0700)]
Update to follow API.
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
Yu Shan Emily Lau [Thu, 26 Aug 2010 02:37:13 +0000 (19:37 -0700)]
Add the new option for the device sleep time. This is only for the scripted monkey.
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
Raphael Moll [Thu, 26 Aug 2010 16:02:13 +0000 (09:02 -0700)]
am
f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merge commit '
f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp
* commit '
f08d230ed0d2612e79c121e0afa1e439b5702815':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:15:11 +0000 (10:15 -0700)]
am
33462598: am
bea98acf: reconcile open-source froyo into google variant
Merge commit '
33462598d8c20001483f3f2e1bca155fa3a83cd5' into gingerbread-plus-aosp
* commit '
33462598d8c20001483f3f2e1bca155fa3a83cd5':
Explicitly enable backup by default in SDK builds
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:13:14 +0000 (10:13 -0700)]
am
bea98acf: reconcile open-source froyo into google variant
Merge commit '
bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread
* commit '
bea98acfa2253796aeade605c7020a7cc942af41':
Explicitly enable backup by default in SDK builds
Brad Fitzpatrick [Wed, 25 Aug 2010 17:10:40 +0000 (10:10 -0700)]
am
06bcd705: Quiet harmless StrictMode violations caused by the Monkey.
Merge commit '
06bcd705606070aa71425fc557e72592a2405a0a' into gingerbread-plus-aosp
* commit '
06bcd705606070aa71425fc557e72592a2405a0a':
Quiet harmless StrictMode violations caused by the Monkey.
Brad Fitzpatrick [Wed, 25 Aug 2010 01:58:14 +0000 (18:58 -0700)]
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
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:37:05 +0000 (09:37 -0700)]
reconcile open-source froyo into google variant
Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
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
Yu Shan Emily Lau [Wed, 25 Aug 2010 03:10:38 +0000 (20:10 -0700)]
am
27d0ec1e: Merge "Add the new option for the scripted monkey profile testing." into gingerbread
Merge commit '
27d0ec1e87dcf41960f87f203c1822e88f99ea38' into gingerbread-plus-aosp
* commit '
27d0ec1e87dcf41960f87f203c1822e88f99ea38':
Add the new option for the scripted monkey profile testing.
Yu Shan Emily Lau [Wed, 25 Aug 2010 03:08:29 +0000 (20:08 -0700)]
Merge "Add the new option for the scripted monkey profile testing." into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 03:02:24 +0000 (20:02 -0700)]
am
4a1b80c3: Merge "Added a couple of new properties." into gingerbread
Merge commit '
4a1b80c386fb2d87ae2d47f6b4c22599227d010f' into gingerbread-plus-aosp
* commit '
4a1b80c386fb2d87ae2d47f6b4c22599227d010f':
Added a couple of new properties.
Brian Carlstrom [Wed, 25 Aug 2010 02:58:19 +0000 (19:58 -0700)]
Merge "Added a couple of new properties." into gingerbread
Yu Shan Emily Lau [Wed, 25 Aug 2010 01:03:32 +0000 (18:03 -0700)]
Add the new option for the scripted monkey profile testing.
Change-Id: I1013a1a0daed948f509d9a29077f0e282baf1a10