Commit Graph

5020 Commits

Author SHA1 Message Date
Kenny Root
b9e80e74e2 Add OBB usage example
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
2010-09-29 16:18:08 -07:00
Ying Wang
5ee69f6f2c Don't send non-existent system keys.
Send only if the system key physically exists.

Change-Id: I8fa102db679c55e5bfba1c9a68ecf2bc196021cd
2010-09-29 13:23:56 -07:00
Eric Fischer
2ec45a5e5a am f4578730: Genericize strings with SD card references.
Merge commit 'f4578730bf95574f417fc2cee979bdc980cd02a8' into gingerbread-plus-aosp

* commit 'f4578730bf95574f417fc2cee979bdc980cd02a8':
  Genericize strings with SD card references.
2010-09-29 12:49:20 -07:00
Eric Fischer
f4578730bf Genericize strings with SD card references.
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
2010-09-29 10:56:20 -07:00
Joe Malin
f82564473f Samples: Fix bugs in Note Pad sample app.
Change-Id: Iacb22efa30d3627dba5a5f91151da5c75722715e
2010-09-28 16:02:00 -07:00
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
6f1718bab5 am daa454cb: am 64e53fe5: Merge "Move adb to the platform-tools."
Merge commit 'daa454cb3ba51dcf75330955dc899d35a7b60989'

* commit 'daa454cb3ba51dcf75330955dc899d35a7b60989':
  Move adb to the platform-tools.
2010-09-27 21:29:10 -07:00
Raphael Moll
745a9108d0 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).
2010-09-27 21:29:06 -07:00
Xavier Ducrohet
daa454cb3b am 64e53fe5: Merge "Move adb to the platform-tools."
Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp

* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
  Move adb to the platform-tools.
2010-09-27 16:44:55 -07:00
Raphael Moll
c0a2e0fc63 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).
2010-09-27 16:44:40 -07:00
Xavier Ducrohet
64e53fe5dd Merge "Move adb to the platform-tools." 2010-09-27 16:24:25 -07:00
Raphael Moll
2f613967a0 Move adb to the platform-tools (windows SDK part).
This is the Win SDK counterpart to Change I4c2a11c1.

Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
6a8e50f695 Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00
Jean-Baptiste Queru
3f666d8754 am 29fd635b: am 7159b406: reconcile froyo-release into gingerbread
Merge commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a'

* commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a':
  Explicitly enable backup by default in SDK builds
2010-09-26 17:51:21 -07:00
Jean-Baptiste Queru
29fd635bfd am 7159b406: reconcile froyo-release into gingerbread
Merge commit '7159b406efb7533f022cbe0bd2d855eb6a52cfe1' into gingerbread-plus-aosp

* commit '7159b406efb7533f022cbe0bd2d855eb6a52cfe1':
  Explicitly enable backup by default in SDK builds
2010-09-26 17:39:26 -07:00
Jean-Baptiste Queru
7159b406ef reconcile froyo-release into gingerbread
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
2010-09-26 17:28:54 -07:00
David 'Digit' Turner
2ffaf68b6b am fe13c761: am be572466: Merge "Update prebuilt library test." into gingerbread
Merge commit 'fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e'

* commit 'fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e':
  Update prebuilt library test.
2010-09-24 01:17:41 -07:00
David 'Digit' Turner
fe13c7616d am be572466: Merge "Update prebuilt library test." into gingerbread
Merge commit 'be57246603d3f6286dc6763a089daf5c1387de55' into gingerbread-plus-aosp

* commit 'be57246603d3f6286dc6763a089daf5c1387de55':
  Update prebuilt library test.
2010-09-24 01:15:20 -07:00
David 'Digit' Turner
be57246603 Merge "Update prebuilt library test." into gingerbread 2010-09-24 01:12:54 -07:00
Dianne Hackborn
b43889e8ba am ebb0b03e: am d424b8d9: Prepare for a new IActivityController method.
Merge commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57'

* commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57':
  Prepare for a new IActivityController method.
2010-09-23 17:34:22 -07:00
Dianne Hackborn
ebb0b03e17 am d424b8d9: Prepare for a new IActivityController method.
Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp

* commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82':
  Prepare for a new IActivityController method.
2010-09-23 16:02:22 -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
9853eb00b3 am 9de6872b: am 1f0003f5: Merge "Unify NDK platform headers." into gingerbread
Merge commit '9de6872b4c0ab35e4466fc05f36e0b9801e06a47'

* commit '9de6872b4c0ab35e4466fc05f36e0b9801e06a47':
  Unify NDK platform headers.
2010-09-23 09:29:27 -07:00
David 'Digit' Turner
9de6872b4c am 1f0003f5: Merge "Unify NDK platform headers." into gingerbread
Merge commit '1f0003f57da3f9805af9ab883d5255be58cf4439' into gingerbread-plus-aosp

* commit '1f0003f57da3f9805af9ab883d5255be58cf4439':
  Unify NDK platform headers.
2010-09-23 08:25:36 -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
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
Dianne Hackborn
8fc1811242 Make FramementLayout demo better... and, um actually work.
Also some other small cleanup.

Change-Id: Iaaf5d4a85113b4a01a4bd3986e2334972e1096ad
2010-09-21 19:29:47 -07:00
Brian Muramatsu
dc42f58a69 Merge "Dual CTS Link Update" 2010-09-21 16:00:03 -07:00
Brett Chabot
a4ced57dc9 am 3211cc0a: am 14282f97: Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
Merge commit '3211cc0abffe7fcd170d992b58c4b758f4064b76'

* commit '3211cc0abffe7fcd170d992b58c4b758f4064b76':
  Change hosttestlib to use ddm-prebuilt.
2010-09-21 14:43:39 -07:00
Andy Stadler
d7448e1497 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
2010-09-21 14:43:35 -07:00
Brett Chabot
3211cc0abf 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.
2010-09-21 14:33:11 -07:00
Andy Stadler
18618e5505 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
2010-09-21 14:28:58 -07: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
Joe Onorato
2d1343ad32 Add sample code for the new tablet ticker.
Change-Id: I621cb3daf3fe79db149e8efbac5ea3ec62371503
2010-09-21 11:55:12 -04:00
Andy Stadler
c47cfb5d47 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
2010-09-18 10:06:02 -07:00
Andy Stadler
66ce420c32 resolved conflicts for merge of 97903767 to gingerbread-plus-aosp
Change-Id: Ic71831342d8e7d548b3d082a97486b40e0636994
2010-09-17 19:16:26 -07:00
Xavier Ducrohet
c54f778e92 am 591b5edf: am d5964750: Package Proguard with the SDK.
Merge commit '591b5edf255a5872fbfb5424f3ee0028fd036d08'

* commit '591b5edf255a5872fbfb5424f3ee0028fd036d08':
  Package Proguard with the SDK.
2010-09-17 16:10:58 -07:00
Andy Stadler
97903767d3 Cleanups for eclipse classpath DO NOT MERGE
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
2010-09-17 15:59:20 -07:00
Brian Muramatsu
be0fb9a065 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
2010-09-17 15:30:59 -07:00
Xavier Ducrohet
591b5edf25 am d5964750: Package Proguard with the SDK.
Merge commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp

* commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
  Package Proguard with the SDK.
2010-09-17 14:31:47 -07:00
Xavier Ducrohet
d59647505d Package Proguard with the SDK.
Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
2010-09-16 15:54:37 -07:00
Amith Yamasani
b1fc132329 Merge "SearchView examples" 2010-09-15 16:11:32 -07:00
Jeff Brown
1114b468a9 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.
2010-09-15 12:32:15 -07:00
Amith Yamasani
ed6ae47c87 SearchView examples 2010-09-14 18:05:13 -07:00
Jeff Brown
434450f73a 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.
2010-09-14 15:30:01 -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
Megha Joshi
8d74e52a0a resolved conflicts for merge of 292096fc to master
Change-Id: I2a0d13b3b36aaf3fd6d6b1161bb75ae5ae890630
2010-09-14 10:39:56 -07:00