James Yum
a88a8393c6
am 40e665a0: cleanup
...
Merge commit '40e665a015c67a8dd21838894a1634a3e101b760' into eclair-plus-aosp
* commit '40e665a015c67a8dd21838894a1634a3e101b760':
cleanup
2010-02-10 13:01:55 -08:00
James Yum
40e665a015
cleanup
...
deleted: licensing/ILicenseResultListener.aidl
deleted: licensing/ILicensingService.aidl
deleted: licensing/LicenseChecker.java
deleted: licensing/LicenseCheckerCallback.java
deleted: licensing/LicenseValidator.java
deleted: licensing/Policy.java
deleted: licensing/ResponseData.java
deleted: licensing/StrictPolicy.java
2010-02-10 11:18:23 -08:00
Dirk Dougherty
2a589050ef
am 4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
...
Merge commit '4389d65caea762b276b1b7d6fd560f4b2c4370b3' into eclair-plus-aosp
* commit '4389d65caea762b276b1b7d6fd560f4b2c4370b3':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
2010-02-09 18:42:38 -08:00
Dirk Dougherty
4389d65cae
Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
2010-02-09 18:36:48 -08:00
Dirk Dougherty
658d86e5be
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
...
Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
2010-02-09 18:00:44 -08:00
David Turner
e52f44d950
am 3b712fda: Merge "Add \'cpufeatures\' library to perform runtime CPU family/features detection." into eclair
...
Merge commit '3b712fda34a3d7a71e6a4ba6ee495b178b2c1830' into eclair-plus-aosp
* commit '3b712fda34a3d7a71e6a4ba6ee495b178b2c1830':
Add 'cpufeatures' library to perform runtime CPU family/features detection.
2010-02-08 12:52:35 -08:00
David Turner
3b712fda34
Merge "Add 'cpufeatures' library to perform runtime CPU family/features detection." into eclair
2010-02-08 12:35:21 -08:00
David 'Digit' Turner
43809914f6
Add 'cpufeatures' library to perform runtime CPU family/features detection.
...
It is provided as a static library that NDK developers can link against.
The code is designed to run on all official Android platforms, starting
from Android 1.5.
2010-02-05 16:03:39 -08:00
The Android Open Source Project
609329541a
merge from open-source master
2010-02-05 13:51:37 -08:00
The Android Open Source Project
f06e372cf9
am c13fbca9: reconcile main tree with open-source eclair
...
Merge commit 'c13fbca985b333cfb09d2b29875b36594dd44d64' into eclair-plus-aosp
* commit 'c13fbca985b333cfb09d2b29875b36594dd44d64':
Add uses-feature for live wallpaper sample.
android-2.1_r1 snapshot
2010-02-05 08:23:01 -08:00
The Android Open Source Project
c13fbca985
reconcile main tree with open-source eclair
2010-02-05 08:09:32 -08:00
Megha Joshi
74ccbf7aa7
am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
...
Merge commit 'ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1' into eclair-plus-aosp
* commit 'ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1':
SampleSyncAdapter sample code.
2010-02-03 12:29:01 -08:00
Megha Joshi
ca7a9d3497
Merge "SampleSyncAdapter sample code." into eclair
2010-02-03 12:24:47 -08:00
Megha Joshi
00bf0f0296
SampleSyncAdapter sample code.
2010-02-01 15:44:47 -08:00
Raphael Moll
eba5766914
am 098a5264: Merge "SDK Manager: post install script to update SDK Setup.exe" into eclair
...
Merge commit '098a5264920e089ec6958f8c74dd0983eda5bc0f' into eclair-plus-aosp
* commit '098a5264920e089ec6958f8c74dd0983eda5bc0f':
SDK Manager: post install script to update SDK Setup.exe
2010-01-29 17:22:29 -08:00
Raphael Moll
098a526492
Merge "SDK Manager: post install script to update SDK Setup.exe" into eclair
2010-01-29 17:17:26 -08:00
David Turner
1921f03a78
am 50c5ce01: Merge "Force ARMv7 builds to use only 16 FP registers." into eclair
...
Merge commit '50c5ce01ca7985b6a76ef67cf171a6eb29c69b80' into eclair-plus-aosp
* commit '50c5ce01ca7985b6a76ef67cf171a6eb29c69b80':
Force ARMv7 builds to use only 16 FP registers.
2010-01-29 14:52:17 -08:00
David Turner
50c5ce01ca
Merge "Force ARMv7 builds to use only 16 FP registers." into eclair
2010-01-29 14:44:39 -08:00
The Android Open Source Project
cd429cbb77
reconcile android-2.1_r1 snapshot
2010-01-29 14:07:44 -08:00
Raphael
6d32277b86
SDK Manager: post install script to update SDK Setup.exe
...
SDK Bug: 2404830
Change-Id: I7e2346c95132ff6d26468d589212bf83e15ce407
2010-01-28 20:13:15 -08:00
David 'Digit' Turner
14665046f8
Force ARMv7 builds to use only 16 FP registers.
...
This is needed because upcoming Cortex-A9 devices implement
VFPv3-D16 instead of the assumed VFPv3-D32 and have thus half
the floating-point registers.
2010-01-28 17:58:56 -08:00
James Yum
a3c89d73bd
am b8168f27: Merge "Market licensing server library core." into eclair
...
Merge commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp
* commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
Market licensing server library core.
2010-01-28 10:51:19 -08:00
Brett Chabot
d392646bfb
am e848f6b2: Merge "Fix cts-content testdef." into eclair
...
Merge commit 'e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9' into eclair-plus-aosp
* commit 'e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9':
Fix cts-content testdef.
2010-01-28 10:51:15 -08:00
James Yum
b8168f27f6
Merge "Market licensing server library core." into eclair
2010-01-28 10:36:53 -08:00
Romain Guy
0c823a12e5
Add uses-feature for live wallpaper sample.
2010-01-28 07:30:54 -08:00
Romain Guy
f515e95ef7
Add uses-feature for live wallpaper sample.
...
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
2010-01-28 07:21:49 -08:00
James Yum
f32f3b5e7b
Market licensing server library core.
...
new file: ILicenseResultListener.aidl
new file: ILicensingService.aidl
new file: LicenseChecker.java
new file: LicenseCheckerCallback.java
new file: Policy.java
new file: ResponseData.java
new file: StrictPolicy.java
new file: LicenseValidator.java
2010-01-27 18:51:48 -08:00
Brett Chabot
e848f6b2c7
Merge "Fix cts-content testdef." into eclair
2010-01-27 17:54:29 -08:00
Brett Chabot
4d1a3b839c
Fix cts-content testdef.
...
Change-Id: I02c98f57c0fbf7cd7fbcdf3e7ba642e0d66acf93
2010-01-27 17:17:16 -08:00
Romain Guy
9c5363b081
am 897af093: Add uses-feature for live wallpaper sample.
...
Merge commit '897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
2010-01-27 17:04:23 -08:00
Romain Guy
897af09372
Add uses-feature for live wallpaper sample.
...
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
2010-01-27 16:55:38 -08:00
Raphael
cb399d52cf
am d51d36fa: Windows SDK: package new tools/find_java.bat
...
Merge commit 'd51d36fa5444ef5f28dbbe5903949e1a75bb2510' into eclair-plus-aosp
* commit 'd51d36fa5444ef5f28dbbe5903949e1a75bb2510':
Windows SDK: package new tools/find_java.bat
2010-01-26 16:28:13 -08:00
Raphael
d51d36fa54
Windows SDK: package new tools/find_java.bat
...
SDK Bug: 2315813
Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
2010-01-26 16:14:55 -08:00
Dirk Dougherty
07b5c3bdb7
am c220077d: Merge "SDK doc change: Misc fixes." into eclair
...
Merge commit 'c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp
* commit 'c220077d52972356ff30d46d47def7669731f0d7':
SDK doc change: Misc fixes.
2010-01-22 16:49:51 -08:00
Dirk Dougherty
c220077d52
Merge "SDK doc change: Misc fixes." into eclair
2010-01-22 16:45:03 -08:00
Dirk Dougherty
e096b94573
SDK doc change: Misc fixes.
...
Bug: 2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
2010-01-22 15:18:15 -08:00
Xavier Ducrohet
a7945e3b9c
am a6181df4: Add Dell Mini5 to the USB driver.
...
Merge commit 'a6181df43110ce1bea8a856295ce372ab06a7873' into eclair-plus-aosp
* commit 'a6181df43110ce1bea8a856295ce372ab06a7873':
Add Dell Mini5 to the USB driver.
2010-01-22 10:52:03 -08:00
Xavier Ducrohet
a6181df431
Add Dell Mini5 to the USB driver.
...
Change-Id: If0758e6dc43541fd2877e7d00ff3abf9d354a299
2010-01-21 17:36:19 -08:00
Karl Ostmo
fa974da92b
resolves Issue #5280 : Go to problem in source from LogCat
2010-01-21 15:45:22 -06:00
Eric Rowe
14dbea614b
am d98ba32e: DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
...
Merge commit 'd98ba32eeff587a30396fa24728a1150de9dc305' into eclair-plus-aosp
* commit 'd98ba32eeff587a30396fa24728a1150de9dc305':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
2010-01-14 17:12:33 -08:00
Eric Rowe
329f400764
am 7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
...
Merge commit '7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '7d961f86208b35c12867a049d4bb815da72167d3':
DO NOT MERGE Create way to run monkey with multiple scripts.
2010-01-14 17:12:28 -08:00
Eric Rowe
d98ba32eef
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
...
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
2010-01-14 17:09:19 -08:00
Eric Rowe
7d961f8620
DO NOT MERGE Create way to run monkey with multiple scripts.
...
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
2010-01-14 17:04:27 -08:00
Eric Rowe
f796440492
am c1d00a99: Merge "Fix how the monkey counts events for scripts." into eclair
...
Merge commit 'c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit 'c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
Fix how the monkey counts events for scripts.
2010-01-13 19:29:32 -08:00
Eric Rowe
c1d00a99f3
Merge "Fix how the monkey counts events for scripts." into eclair
2010-01-13 19:25:21 -08:00
Eric Rowe
66e263baed
Fix how the monkey counts events for scripts.
...
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
2010-01-13 18:22:32 -08:00
David Turner
a84a9656b3
am 23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
...
Merge commit '23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c' into eclair-plus-aosp
* commit '23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
2010-01-13 17:25:42 -08:00
David Turner
23d8ded2e1
Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
2010-01-13 17:21:11 -08:00
David 'Digit' Turner
eef791e9a1
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
2010-01-13 16:50:57 -08:00
Eric Rowe
8315bb4933
am b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
...
Merge commit 'b2fa770013cf1b6b8bf0619a946a54feafec5197' into eclair-plus-aosp
* commit 'b2fa770013cf1b6b8bf0619a946a54feafec5197':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
2010-01-13 15:41:28 -08:00