OSDN Git Service
Kenny Root [Thu, 30 Sep 2010 18:29:05 +0000 (11:29 -0700)]
am
e575be05: am
12c86756: Merge "Add OBB usage example" into gingerbread
Merge commit '
e575be05fd15d0858e4e0655ba3e1d6ecacf26d4'
* commit '
e575be05fd15d0858e4e0655ba3e1d6ecacf26d4':
Add OBB usage example
Xavier Ducrohet [Thu, 30 Sep 2010 18:27:02 +0000 (11:27 -0700)]
am
92d47e4e: am
682ec293: Split the tools component from sdk.atree
Merge commit '
92d47e4ef65c225bcf82c81377412d5c67349ff5'
* commit '
92d47e4ef65c225bcf82c81377412d5c67349ff5':
Split the tools component from sdk.atree
Eric Fischer [Thu, 30 Sep 2010 18:25:00 +0000 (11:25 -0700)]
am
2ec45a5e: am
f4578730: Genericize strings with SD card references.
Merge commit '
2ec45a5e5a56508d81d54b1e3fa35ac9d118708c'
* commit '
2ec45a5e5a56508d81d54b1e3fa35ac9d118708c':
Genericize strings with SD card references.
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
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
Joe Malin [Tue, 28 Sep 2010 23:02:00 +0000 (16:02 -0700)]
Samples: Fix bugs in Note Pad sample app.
Change-Id: Iacb22efa30d3627dba5a5f91151da5c75722715e
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 [Tue, 28 Sep 2010 04:29:10 +0000 (21:29 -0700)]
am
daa454cb: am
64e53fe5: Merge "Move adb to the platform-tools."
Merge commit '
daa454cb3ba51dcf75330955dc899d35a7b60989'
* commit '
daa454cb3ba51dcf75330955dc899d35a7b60989':
Move adb to the platform-tools.
Raphael Moll [Tue, 28 Sep 2010 04:29:06 +0000 (21:29 -0700)]
am
c0a2e0fc: am
2f613967: Move adb to the platform-tools (windows SDK part).
Merge commit '
c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5'
* commit '
c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5':
Move adb to the platform-tools (windows SDK part).
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:51:21 +0000 (17:51 -0700)]
am
29fd635b: am
7159b406: reconcile froyo-release into gingerbread
Merge commit '
29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a'
* commit '
29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a':
Explicitly enable backup by default in SDK builds
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:17:41 +0000 (01:17 -0700)]
am
fe13c761: am
be572466: Merge "Update prebuilt library test." into gingerbread
Merge commit '
fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e'
* commit '
fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e':
Update prebuilt library test.
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 [Fri, 24 Sep 2010 00:34:22 +0000 (17:34 -0700)]
am
ebb0b03e: am
d424b8d9: Prepare for a new IActivityController method.
Merge commit '
ebb0b03e170b724e04a0d44bfd1ccb02452f5f57'
* commit '
ebb0b03e170b724e04a0d44bfd1ccb02452f5f57':
Prepare for a new IActivityController method.
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 16:29:27 +0000 (09:29 -0700)]
am
9de6872b: am
1f0003f5: Merge "Unify NDK platform headers." into gingerbread
Merge commit '
9de6872b4c0ab35e4466fc05f36e0b9801e06a47'
* commit '
9de6872b4c0ab35e4466fc05f36e0b9801e06a47':
Unify NDK platform headers.
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
Dianne Hackborn [Mon, 13 Sep 2010 02:38:56 +0000 (19:38 -0700)]
Make FramementLayout demo better... and, um actually work.
Also some other small cleanup.
Change-Id: Iaaf5d4a85113b4a01a4bd3986e2334972e1096ad
Brian Muramatsu [Tue, 21 Sep 2010 23:00:03 +0000 (16:00 -0700)]
Merge "Dual CTS Link Update"
Brett Chabot [Tue, 21 Sep 2010 21:43:39 +0000 (14:43 -0700)]
am
3211cc0a: am
14282f97: Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
Merge commit '
3211cc0abffe7fcd170d992b58c4b758f4064b76'
* commit '
3211cc0abffe7fcd170d992b58c4b758f4064b76':
Change hosttestlib to use ddm-prebuilt.
Andy Stadler [Tue, 21 Sep 2010 21:43:35 +0000 (14:43 -0700)]
am
18618e55: (-s ours) am
9b2d35f0: DO NOT MERGE Classpath cleanup in libcore
Merge commit '
18618e55055cb2377c88004e18f6e147899bf216'
* commit '
18618e55055cb2377c88004e18f6e147899bf216':
DO NOT MERGE Classpath cleanup in libcore
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
Joe Onorato [Tue, 21 Sep 2010 15:55:12 +0000 (11:55 -0400)]
Add sample code for the new tablet ticker.
Change-Id: I621cb3daf3fe79db149e8efbac5ea3ec62371503
Andy Stadler [Sat, 18 Sep 2010 17:06:02 +0000 (10:06 -0700)]
am
66ce420c: (-s ours) resolved conflicts for merge of
97903767 to gingerbread-plus-aosp
Merge commit '
66ce420c325fe32a4da67f8a9a0914a093df2f42'
* commit '
66ce420c325fe32a4da67f8a9a0914a093df2f42':
Cleanups for eclipse classpath DO NOT MERGE
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
Xavier Ducrohet [Fri, 17 Sep 2010 23:10:58 +0000 (16:10 -0700)]
am
591b5edf: am
d5964750: Package Proguard with the SDK.
Merge commit '
591b5edf255a5872fbfb5424f3ee0028fd036d08'
* commit '
591b5edf255a5872fbfb5424f3ee0028fd036d08':
Package Proguard with the SDK.
Andy Stadler [Fri, 17 Sep 2010 22:59:20 +0000 (15:59 -0700)]
Cleanups for eclipse classpath DO NOT MERGE
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
Brian Muramatsu [Fri, 17 Sep 2010 22:30:59 +0000 (15:30 -0700)]
Dual CTS Link Update
Bug
3008740
Update the Eclair link to CTS 2.1_r5 and the
Froyo link to CTS 2.2_r3.
Change-Id: I08ae9879da51d7b9fdff67a9ff9da7f5a0448411
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
Amith Yamasani [Wed, 15 Sep 2010 23:11:32 +0000 (16:11 -0700)]
Merge "SearchView examples"
Jeff Brown [Wed, 15 Sep 2010 19:32:15 +0000 (12:32 -0700)]
am
434450f7: am
2405e67f: Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread
Merge commit '
434450f73adf9306241ea44ec389bfdd7a6cd765'
* commit '
434450f73adf9306241ea44ec389bfdd7a6cd765':
Update NDK headers and samples to sync up with looper API changes.
Amith Yamasani [Sat, 4 Sep 2010 00:11:31 +0000 (17:11 -0700)]
SearchView examples
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
Megha Joshi [Tue, 14 Sep 2010 17:39:56 +0000 (10:39 -0700)]
resolved conflicts for merge of
292096fc to master
Change-Id: I2a0d13b3b36aaf3fd6d6b1161bb75ae5ae890630
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
Dianne Hackborn [Sun, 12 Sep 2010 03:58:59 +0000 (20:58 -0700)]
Modify retain sample to show of retained targets.
Change-Id: I33dd83651006469ef2af7976861f3b832e13bf60
Vairavan Srinivasan [Fri, 10 Sep 2010 23:36:56 +0000 (16:36 -0700)]
am
3d925ea9: am
50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '
3d925ea9e884000a7e5e8e18c681967f9550b15d'
* commit '
3d925ea9e884000a7e5e8e18c681967f9550b15d':
GlobalTime: Perform Zoom In and Out only after initialization
Trevor Johns [Fri, 10 Sep 2010 23:36:25 +0000 (16:36 -0700)]
am
915bdba9: am
12d3ad89: am
e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit '
915bdba9ac6c272fc127ab39b9a8019b7ad24e61'
* commit '
915bdba9ac6c272fc127ab39b9a8019b7ad24e61':
Use remote_api for shell access on developer.android.com.
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.
Bruce Gay [Fri, 10 Sep 2010 19:36:34 +0000 (12:36 -0700)]
Adding support for crespo and stingray in the labpretest.sh
Change-Id: I2af967290653cc5ed40e3ddae233c5da61ac61aa
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
Chet Haase [Thu, 9 Sep 2010 22:35:56 +0000 (15:35 -0700)]
Merge "Enhanced demo for view transformation properties"
Chet Haase [Thu, 9 Sep 2010 21:53:12 +0000 (14:53 -0700)]
Enhanced demo for view transformation properties
Change-Id: I01939513d7848b09ce17e7f604512a89062f446f
Jeff Brown [Wed, 8 Sep 2010 20:11:24 +0000 (13:11 -0700)]
resolved conflicts for merge of
2073f44b to master
Change-Id: I4e787edd6aed6027ceb30bd9c6def6912c48c63c
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
Gilles Debunne [Wed, 8 Sep 2010 17:58:26 +0000 (10:58 -0700)]
New simple_selectable_list_item layout demo in ApiDemos / List
This layout uses the new border rectangle to highlight selected items.
Change-Id: Ic1b1bb4cb703c1f30e36a2913b9432a76ea0a6d6
Gilles Debunne [Wed, 8 Sep 2010 18:09:19 +0000 (11:09 -0700)]
Merge "Added a disabled button and a second text edit in View / Controls"
Gilles Debunne [Wed, 8 Sep 2010 15:11:10 +0000 (08:11 -0700)]
Added a disabled button and a second text edit in View / Controls
Change-Id: I2e0e9b480609289fa7f9546614af51d4ce293a9c
Chet Haase [Tue, 7 Sep 2010 20:43:53 +0000 (13:43 -0700)]
Animation classname changes
Change-Id: I0b3b5f1563ab0ac301684880957ed55ebfc54da5
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 [Wed, 8 Sep 2010 01:51:59 +0000 (18:51 -0700)]
am
eb39544d: am
d3d58cf7: Update to follow ALooper ident change.
Merge commit '
eb39544df62682e2f765b62488daea7a8100f4cd'
* commit '
eb39544df62682e2f765b62488daea7a8100f4cd':
Update to follow ALooper ident change.
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
Joe Onorato [Tue, 7 Sep 2010 21:48:17 +0000 (14:48 -0700)]
am
31018711: am
7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '
310187112b211f24c074fd9e34db9dddc59158f3'
* commit '
310187112b211f24c074fd9e34db9dddc59158f3':
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
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
Steve Block [Sat, 4 Sep 2010 18:13:26 +0000 (11:13 -0700)]
Merge changes I3fe2596a,I340c69c6
* changes:
Updates source.android.com for external contributions to V8
Fixes missing footers in Source tab of http://source.android.com
Steve Block [Fri, 3 Sep 2010 10:25:05 +0000 (11:25 +0100)]
Updates source.android.com for external contributions to V8
Instructs external contributors that changes to external/v8 should be made
directly at http://code.google.com/p/v8.
Change-Id: I3fe2596a183751eeba968f51d206ea37b1d26bb2
Chet Haase [Fri, 3 Sep 2010 22:43:47 +0000 (15:43 -0700)]
Demo ability to enable default layout animations from XML
Change-Id: I4a5c73391d277c248958cf8cb5260078006bafb1
Chet Haase [Tue, 17 Aug 2010 00:42:33 +0000 (17:42 -0700)]
Demo of layout add/remove transitions
Change-Id: Ib5f31bb0b6d16fa18cf10a426a25c7a8138f620a
Steve Block [Fri, 3 Sep 2010 10:20:18 +0000 (11:20 +0100)]
Fixes missing footers in Source tab of source.android.com
Also fixes broken style in bottom half of http://source.android.com/source/download.html
Change-Id: I340c69c6dfe55aabc8446dd9313597bf88d6b369
Steve Block [Fri, 3 Sep 2010 09:03:15 +0000 (02:03 -0700)]
Merge "Updates source.android.com for external contributions to WebKit"
Dianne Hackborn [Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)]
am
84d495af: am
23bff5dd: Add API demo for picking a contact with a permission grant.
Merge commit '
84d495af1b030208cced9b3cd70486a0e9af6370'
* commit '
84d495af1b030208cced9b3cd70486a0e9af6370':
Add API demo for picking a contact with a permission grant.
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
Steve Block [Thu, 2 Sep 2010 13:29:43 +0000 (14:29 +0100)]
Updates source.android.com for external contributions to WebKit
Instructs external contributors that changes to external/webkit should be made
directly at webkit.org.
I've assumed that in the future we will (or should now) direct external
contributors to make changes upstream for other upstream projects too.
Change-Id: I538930794907729ebcca4cbb20a2952d0159873f
Xavier Ducrohet [Thu, 2 Sep 2010 00:19:26 +0000 (17:19 -0700)]
am
666f4c09: (-s ours) am
b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Merge commit '
666f4c0955d76e0792a58189b717a6666ed9935a'
* commit '
666f4c0955d76e0792a58189b717a6666ed9935a':
New SDK architecture. DO NOT MERGE.
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
Dan Morrill [Wed, 1 Sep 2010 17:14:22 +0000 (10:14 -0700)]
Merge "Changing default CDD to 2.2."
Xavier Ducrohet [Mon, 30 Aug 2010 23:14:36 +0000 (16:14 -0700)]
Merge "Make source.properties use the current codename."
OSDN Git Service
