LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,784 Commits 2 Branches 0 Tags
ecf11ceb6015b715b711475a46d819a73bb62d3c
Commit Graph

4784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
ecf11ceb60 am 6a10d397: am c70ceb23: initial checkin. Needs lots of love. 
Merge commit '6a10d397f311f7816d29e9879eb1c020b8863821'

* commit '6a10d397f311f7816d29e9879eb1c020b8863821':
 2010-09-30 18:11:32 -07:00
Jeff Brown
cc633e4965 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp 
Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b
 2010-09-30 16:39:16 -07:00
Xavier Ducrohet
77fdd16cf3 am 3975280e: (-s ours) am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE 
Merge commit '3975280e0583d45de4708375622b22019a0df9f5'

* commit '3975280e0583d45de4708375622b22019a0df9f5':
  Integrate sdk.atree changes from master. DO NOT MERGE
 2010-09-30 16:00:51 -07:00
Jeff Brown
4110368b93 Merge "Improve touch paint sample to use geometrical touch width." into gingerbread 2010-09-30 15:58:59 -07:00
Jeff Brown
fc1ee06369 Improve touch paint sample to use geometrical touch width. 
Added multitouch support.
Fixed the trackball based drawing.

Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
 2010-09-30 15:32:28 -07:00
Nick Kralevich
6a10d397f3 am c70ceb23: initial checkin. Needs lots of love. 
Merge commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91' into gingerbread-plus-aosp

* commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91':
  initial checkin.  Needs lots of love.
 2010-09-30 15:21:49 -07:00
Nick Kralevich
c70ceb2363 initial checkin. Needs lots of love. 
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
 2010-09-30 15:16:58 -07:00
Xavier Ducrohet
3975280e05 am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE 
Merge commit '76afc004df452384cfd00137a59c7a3e0502ff75' into gingerbread-plus-aosp

* commit '76afc004df452384cfd00137a59c7a3e0502ff75':
  Integrate sdk.atree changes from master. DO NOT MERGE
 2010-09-30 13:20:12 -07:00
Jeff Brown
b39c4ba316 Added samples for splitting touches across views. 
Also modified the rotating button demo to use touch splitting.

Change-Id: I560736903651e6846f847a9bd743a24a1707f6d2
 2010-09-30 11:56:14 -07:00
Xavier Ducrohet
76afc004df Integrate sdk.atree changes from master. 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
 2010-09-30 11:33:21 -07:00
Kenny Root
4e64cbb031 am e575be05: am 12c86756: Merge "Add OBB usage example" into gingerbread 
Merge commit 'e575be05fd15d0858e4e0655ba3e1d6ecacf26d4'

* commit 'e575be05fd15d0858e4e0655ba3e1d6ecacf26d4':
  Add OBB usage example
 2010-09-30 11:29:05 -07:00
Xavier Ducrohet
87bfd07634 am 92d47e4e: am 682ec293: Split the tools component from sdk.atree 
Merge commit '92d47e4ef65c225bcf82c81377412d5c67349ff5'

* commit '92d47e4ef65c225bcf82c81377412d5c67349ff5':
  Split the tools component from sdk.atree
 2010-09-30 11:27:02 -07:00
Eric Fischer
b4ad0ca975 am 2ec45a5e: am f4578730: Genericize strings with SD card references. 
Merge commit '2ec45a5e5a56508d81d54b1e3fa35ac9d118708c'

* commit '2ec45a5e5a56508d81d54b1e3fa35ac9d118708c':
  Genericize strings with SD card references.
 2010-09-30 11:25:00 -07:00
Kenny Root
e575be05fd am 12c86756: Merge "Add OBB usage example" into gingerbread 
Merge commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp

* commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
  Add OBB usage example
 2010-09-30 10:09:11 -07:00
Xavier Ducrohet
92d47e4ef6 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
 2010-09-30 08:52:23 -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
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