Xavier Ducrohet
3b10d94a49
am d13d440d: Emulator launch options dialog.
...
Merge commit 'd13d440d43a744ab6e596e52cf53eef79d222d01'
* commit 'd13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
2009-10-12 11:23:30 -07:00
Raphael
15fdd346a2
am ef133787: SDK: Fix CustomLocale to properly setup Language+Country
...
Merge commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560'
* commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
2009-10-12 11:23:25 -07:00
Jeff Sharkey
65ab5053c9
am 480332f6: Revise template to match spec per jham.
...
Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f'
* commit '480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
2009-10-12 11:23:15 -07:00
David 'Digit' Turner
ce3ff41ba0
am cc230ba0: Ensure the version of \'awk\' detected by host-setup.sh is used during the build
...
Merge commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee'
* commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee':
Ensure the version of 'awk' detected by host-setup.sh is used during the build
2009-10-12 11:23:11 -07:00
David 'Digit' Turner
3264e24b22
am 79adc9fc: Merge change Ia78a7753 into eclair
...
Merge commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245'
* commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
2009-10-12 11:23:06 -07:00
Xavier Ducrohet
cfa2b8acd3
am f0737030: Fix Android Manifest parser.
...
Merge commit 'f0737030570be15c1789d00db3593eb78cee9fbc'
* commit 'f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
2009-10-12 11:23:01 -07:00
Raphael
122c3dd9c6
am 2ace885b: ADT Manifest Editor: Fix for uses-sdk dup that won\'t go away.
...
Merge commit '2ace885b2945aba76266bc54ad9fa59fb4e05187'
* commit '2ace885b2945aba76266bc54ad9fa59fb4e05187':
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
2009-10-12 11:22:56 -07:00
Raphael
4e53735ede
am 657bdd7d: Merge change I8a575e49 into eclair
...
Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593'
* commit '657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
2009-10-12 11:22:52 -07:00
Xavier Ducrohet
cd53b3bc5a
am 2cdd16b7: fix the build
...
Merge commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652'
* commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652':
fix the build
2009-10-12 11:22:47 -07:00
Raphael
9729e97806
am 1233e408: Merge change Ie3124796 into eclair
...
Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629'
* commit '1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
2009-10-12 11:22:42 -07:00
Xavier Ducrohet
6a368fcf3e
am 227b8768: Load default GLE device profiles from the SDK.
...
Merge commit '227b8768fa8accff8a9e3555351af05d41ad7840'
* commit '227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
2009-10-12 11:22:37 -07:00
Brett Chabot
0d4f7cd48a
am 264d42dd: Merge change Idf5bcb58 into eclair
...
Merge commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900' into eclair-mr2
* commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900':
Fix ant install when -Dadb.device.arg not provided.
2009-10-09 11:52:02 -07:00
Android (Google) Code Review
264d42dd1c
Merge change Idf5bcb58 into eclair
...
* changes:
Fix ant install when -Dadb.device.arg not provided.
2009-10-09 14:45:22 -04:00
Brett Chabot
1a363965c5
Fix ant install when -Dadb.device.arg not provided.
...
And also add the adb.device.arg support to ant uninstall.
BUG 2172690
2009-10-09 11:42:14 -07:00
Raphael
0c384c5814
am b2fa9b71: Merge change I2c7af74e into eclair
...
Merge commit 'b2fa9b713d82e2111eeee83d134802b3ae67a142' into eclair-mr2
* commit 'b2fa9b713d82e2111eeee83d134802b3ae67a142':
SDK Updater: don't auto-expand archives when selecting a package
2009-10-09 10:59:22 -07:00
Android (Google) Code Review
b2fa9b713d
Merge change I2c7af74e into eclair
...
* changes:
SDK Updater: don't auto-expand archives when selecting a package
2009-10-09 13:52:36 -04:00
Nicolas Catania
4a5dc7e0c3
Minor cleanup, fix documentation.
...
Refactored the tests for the makefile existence in a
separate function.
Ran checkdoc and fixed errors.
2009-10-09 09:29:33 -07:00
Gaurav Mathur
800158fb99
Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-08 23:50:24 -07:00
Android (Google) Code Review
494bb69bfd
Merge change I79297bbe into eclair-mr2
...
* changes:
Turn of log message that was accidentally left on in an earlier commit.
2009-10-08 23:14:45 -04:00
Jack Palevich
79297bbe31
Turn of log message that was accidentally left on in an earlier commit.
2009-10-08 20:12:57 -07:00
Raphael
b80add6c6d
am 3334a587: Fix "android create project" to properly set name in strings.xml
...
Merge commit '3334a5874e81a936cb866fd19f4beb7a425989ef' into eclair-mr2
* commit '3334a5874e81a936cb866fd19f4beb7a425989ef':
Fix "android create project" to properly set name in strings.xml
2009-10-08 17:36:29 -07:00
Raphael
cfd96c9a12
am 8eff7f57: Support adb device-targeting arguments in ant scripts.
...
Merge commit '8eff7f5779ba938ba7dcd981e0c6f3f97096dd26' into eclair-mr2
* commit '8eff7f5779ba938ba7dcd981e0c6f3f97096dd26':
Support adb device-targeting arguments in ant scripts.
2009-10-08 17:35:36 -07:00
Xavier Ducrohet
ab1b631b2c
am f40ac8d6: Merge change Ic4387354 into eclair
...
Merge commit 'f40ac8d60519c871e35a4ea4b80c6c64b13cbc3a' into eclair-mr2
* commit 'f40ac8d60519c871e35a4ea4b80c6c64b13cbc3a':
Make WVGA/High skins use a higher VM heap size.
2009-10-08 17:31:26 -07:00
Raphael
1d85d8d114
am 97a6420d: Merge change I935c71f2 into eclair
...
Merge commit '97a6420dcb6f2c936829d97ef5018d7e5595eeeb' into eclair-mr2
* commit '97a6420dcb6f2c936829d97ef5018d7e5595eeeb':
Add sholes to Windows USB Driver in Eclair.
2009-10-08 17:31:08 -07:00
Raphael
9c8f3496f1
am f3ae13d0: Merge change I7d549c26 into eclair
...
Merge commit 'f3ae13d06f1f7d9ad86248491fc2e76b07d5fd0f' into eclair-mr2
* commit 'f3ae13d06f1f7d9ad86248491fc2e76b07d5fd0f':
Add SdkUiLib tests to adt-tests.
2009-10-08 17:30:47 -07:00
Raphael
3dcef76d30
am 0947e82e: Merge change Ica46d149 into eclair
...
Merge commit '0947e82e4ec99de726829903ea67cbae3d4a9e66' into eclair-mr2
* commit '0947e82e4ec99de726829903ea67cbae3d4a9e66':
SDK Updater: platform dependency on tools, addon dependency on platform.
2009-10-08 17:30:20 -07:00
Xavier Ducrohet
fb00ff8a6a
am 9cb6feee: Merge change Ia20b55c7 into eclair
...
Merge commit '9cb6feee3ae7b96be6d6829aef1a06c4b68b8e3e' into eclair-mr2
* commit '9cb6feee3ae7b96be6d6829aef1a06c4b68b8e3e':
Add hardware support to AVD creation dialog.
2009-10-08 17:29:57 -07:00
Jean-Baptiste Queru
d410b728d5
am b7c548eb: am fb244224: merge from donut-gms
...
Merge commit 'b7c548eb237bc2383cf05ba41a8076743d75ab9a' into eclair-mr2
* commit 'b7c548eb237bc2383cf05ba41a8076743d75ab9a':
Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
adding a recorder function to collect output into an xml file; adding getvars and listvars command to MonkeyRunner
Add runtest test def for cts-webkit.
2009-10-08 17:29:52 -07:00
Raphael
38169df333
SDK Updater: don't auto-expand archives when selecting a package
...
SDK BUG 2177033
Change-Id: I2c7af74e0dbbb3fc452e15e135b656a89bde4d31
2009-10-08 16:36:41 -07:00
Raphael
3334a5874e
Fix "android create project" to properly set name in strings.xml
...
Layout was wrong too.
SDK BUG 2176634
Change-Id: Ibbec1c47037d4a6dd875953c1875daaac4f11106
2009-10-08 15:16:22 -07:00
Raphael
8eff7f5779
Support adb device-targeting arguments in ant scripts.
...
Example of usage:
$ ant install -Dadb.device.arg=-d
SDK BUG 2172690
Change-Id: I196441f9aab888b1356b4fc0255842570be5140f
2009-10-08 15:05:09 -07:00
Android (Google) Code Review
f40ac8d605
Merge change Ic4387354 into eclair
...
* changes:
Make WVGA/High skins use a higher VM heap size.
2009-10-08 17:46:14 -04:00
Xavier Ducrohet
08f10846f1
Make WVGA/High skins use a higher VM heap size.
...
Change-Id: Ic43873545dd7a9482e4214ed3750a8e2108cafc6
2009-10-08 14:40:12 -07:00
Android (Google) Code Review
97a6420dcb
Merge change I935c71f2 into eclair
...
* changes:
Add sholes to Windows USB Driver in Eclair.
2009-10-08 17:35:44 -04:00
Raphael
0c638bb8b0
Add sholes to Windows USB Driver in Eclair.
...
SDK BUG 2132512
Change-Id: I935c71f2fb689ed8e493e3375ad676f6f66a3f76
2009-10-08 14:33:42 -07:00
Android (Google) Code Review
f3ae13d06f
Merge change I7d549c26 into eclair
...
* changes:
Add SdkUiLib tests to adt-tests.
2009-10-08 17:20:28 -04:00
Android (Google) Code Review
0947e82e4e
Merge change Ica46d149 into eclair
...
* changes:
SDK Updater: platform dependency on tools, addon dependency on platform.
2009-10-08 15:51:29 -04:00
Raphael
b192b0ef5b
SDK Updater: platform dependency on tools, addon dependency on platform.
...
SDK BUG 2040986
Change-Id: Ica46d14939bb3a9bf499899a0bf571456d4c6017
2009-10-08 11:55:48 -07:00
Android (Google) Code Review
9cb6feee3a
Merge change Ia20b55c7 into eclair
...
* changes:
Add hardware support to AVD creation dialog.
2009-10-08 14:35:38 -04:00
Jean-Baptiste Queru
b7c548eb23
am fb244224: merge from donut-gms
...
Merge commit 'fb244224235c33b492774f32e8caf8d43f2a3cec' into eclair
* commit 'fb244224235c33b492774f32e8caf8d43f2a3cec':
Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
adding a recorder function to collect output into an xml file; adding getvars and listvars command to MonkeyRunner
Add runtest test def for cts-webkit.
2009-10-08 10:43:28 -07:00
Marco Nelissen
7b7bdf133a
am 32739c61: Merge change I2e026098 into eclair
...
Merge commit '32739c6183d525f371c37d923a85c1150a6a1b0d' into eclair-mr2
* commit '32739c6183d525f371c37d923a85c1150a6a1b0d':
Three implementations of a live wallpaper showing a spinning cube.
2009-10-08 10:36:37 -07:00
Android (Google) Code Review
32739c6183
Merge change I2e026098 into eclair
...
* changes:
Three implementations of a live wallpaper showing a spinning cube. One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
2009-10-08 13:10:19 -04:00
Jean-Baptiste Queru
fb24422423
merge from donut-gms
2009-10-08 10:00:39 -07:00
Raphael
e3ae0fe73a
Add SdkUiLib tests to adt-tests.
...
Also fixes the create_tests_symlink for Windows.
SDK BUG 2040986
Change-Id: I7d549c265efb9dbb5936ed7c9a7798eefee52d9b
2009-10-07 21:57:50 -07:00
Xavier Ducrohet
3a05612f59
Add hardware support to AVD creation dialog.
...
Change-Id: Ia20b55c788191b40159b5c38b66f1da333179ccc
2009-10-07 19:52:43 -07:00
Xavier Ducrohet
e3ec490a41
am 211195d1: Merge change I0d2bc2d1 into eclair
...
Merge commit '211195d1931da4a77ffb42dc15a9bf5afdd6b52a' into eclair-mr2
* commit '211195d1931da4a77ffb42dc15a9bf5afdd6b52a':
New based dialog class.
2009-10-07 16:14:36 -07:00
Android (Google) Code Review
211195d193
Merge change I0d2bc2d1 into eclair
...
* changes:
New based dialog class.
2009-10-07 19:08:05 -04:00
Xavier Ducrohet
5e5e423346
New based dialog class.
...
This simply (for now) extends the jface dialog to properly
set it up.
Change-Id: I0d2bc2d10aad3811201f9d1df3efbfc87be50cb4
2009-10-07 16:04:23 -07:00
Raphael
86ff4a1905
am 1121ceba: SDK: remove default.properties from ApiDemos
...
Merge commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2' into eclair-mr2
* commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2':
SDK: remove default.properties from ApiDemos
2009-10-07 15:53:59 -07:00
Raphael
1121ceba04
SDK: remove default.properties from ApiDemos
...
It's annoying to have to maintain this. Remove it and understand
why we needed it in the first place. If we do, we'll generate
it when packaging the SDK rather than have it in the tree.
SDK BUG 2144477
2009-10-07 15:20:21 -07:00