Raphael
d2a6cedde8
am 369978fd: am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
...
Merge commit '369978fd3167a19f3e2e303c8874b66e8429f25f'
* commit '369978fd3167a19f3e2e303c8874b66e8429f25f':
Windows SDK: copy SDK Setup.exe at root of SDK.
2009-10-14 11:58:49 -07:00
Raphael
369978fd31
am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
...
Merge commit '62437b9984649c80aa3a7d93750efdc5ff206d07' into eclair-mr2
* commit '62437b9984649c80aa3a7d93750efdc5ff206d07':
Windows SDK: copy SDK Setup.exe at root of SDK.
2009-10-14 11:39:42 -07:00
Android (Google) Code Review
e367f3fce8
Merge change I94f75699
...
* changes:
Reimport translations.
2009-10-14 13:02:18 -04:00
Xavier Ducrohet
f30cc73f37
am 861465a9: am e19c0298: Merge change Idc447b41 into eclair
...
Merge commit '861465a93c9634e1c2a345882ae71d0c3e21f4a2'
* commit '861465a93c9634e1c2a345882ae71d0c3e21f4a2':
UI to manage/create custom Layout Devices.
2009-10-14 07:56:14 -07:00
Xavier Ducrohet
861465a93c
am e19c0298: Merge change Idc447b41 into eclair
...
Merge commit 'e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-mr2
* commit 'e19c02984fd10c9fa35b036aafc1181cb8384069':
UI to manage/create custom Layout Devices.
2009-10-14 07:37:28 -07:00
Raphael
62437b9984
Windows SDK: copy SDK Setup.exe at root of SDK.
...
Also add a source.properties (we'll install it on the vendor/google
script part of the script).
SDK BUG 2173135
Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71
2009-10-14 07:21:26 -07:00
Android (Google) Code Review
e19c02984f
Merge change Idc447b41 into eclair
...
* changes:
UI to manage/create custom Layout Devices.
2009-10-14 01:51:44 -04:00
Xavier Ducrohet
c298b5a013
am 18cd1078: am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
...
Merge commit '18cd10783b01156169c44f76778590cdf25beaa2'
* commit '18cd10783b01156169c44f76778590cdf25beaa2':
Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
2009-10-13 21:05:12 -07:00
Xavier Ducrohet
91e5979865
am 37f35fdc: am bc7c3672: Merge change I6dbcafab into eclair
...
Merge commit '37f35fdca099beabcef9220b809c42c7567c9749'
* commit '37f35fdca099beabcef9220b809c42c7567c9749':
Fix NPE in the parsing of property file.
2009-10-13 21:05:07 -07:00
Xavier Ducrohet
18cd10783b
am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
...
Merge commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60' into eclair-mr2
* commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60':
Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
2009-10-13 20:46:47 -07:00
Xavier Ducrohet
37f35fdca0
am bc7c3672: Merge change I6dbcafab into eclair
...
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2
* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
Fix NPE in the parsing of property file.
2009-10-13 20:46:42 -07:00
Xavier Ducrohet
3b9d33b3e0
Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
...
Change-Id: I6b95f5758c36979cca06483f1ff797ba67ecd056
2009-10-13 19:24:58 -07:00
Xavier Ducrohet
8f49a988e3
UI to manage/create custom Layout Devices.
...
Change-Id: Idc447b4136a6f709d7a665321af68de552ec613a
2009-10-13 18:35:13 -07:00
Derek Sollenberger
60bee9c342
am 60e45099: Merge change Ibb660dd5 into eclair-mr2
...
Merge commit '60e45099aa404686c3b6d38187306fe5bb90cd8f'
* commit '60e45099aa404686c3b6d38187306fe5bb90cd8f':
updating sample plugins to support fixed surface dimensions.
2009-10-13 17:08:26 -07:00
Raphael
ab2d129a89
am f4fe738d: am 96fc3df6: Merge change Ib096f1f0 into eclair
...
Merge commit 'f4fe738d0f18f361815c0bdffefece726b622706'
* commit 'f4fe738d0f18f361815c0bdffefece726b622706':
SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-13 17:06:06 -07:00
Raphael
532dd1b213
am 46ab498e: am 9bdf821f: SDK: Support "android.bat update sdk"
...
Merge commit '46ab498e50ba71467c71ebe14784706148554b86'
* commit '46ab498e50ba71467c71ebe14784706148554b86':
SDK: Support "android.bat update sdk"
2009-10-13 17:03:58 -07:00
Raphael
1c8693f447
am acadcaca: am 5ca98eb0: Merge change I5359971f into eclair
...
Merge commit 'acadcaca51b8bedaaa8b188c8800ffc323d0bd06'
* commit 'acadcaca51b8bedaaa8b188c8800ffc323d0bd06':
New "SDK Launcher" for Windows.
2009-10-13 17:03:26 -07:00
Raphael
f09d25e5f9
am 8583fb38: am 6fb8880a: Merge change I26a21669 into eclair
...
Merge commit '8583fb381bf2bedee8efa85abda42673ba9f7a9c'
* commit '8583fb381bf2bedee8efa85abda42673ba9f7a9c':
Set SDK Platform/Doc to API 5.
2009-10-13 17:02:21 -07:00
Raphael
ae827df5e8
am 7dcaccf3: am e4c98c01: SDK Manager: display packages revisions
...
Merge commit '7dcaccf359f25586218d33a28cd05ad81af43fb1'
* commit '7dcaccf359f25586218d33a28cd05ad81af43fb1':
SDK Manager: display packages revisions
2009-10-13 16:57:25 -07:00
Raphael
aec2e11fca
am d3fb418c: am e7ad6a5e: Merge change I2fb42327 into eclair
...
Merge commit 'd3fb418c7c82c47c0b2c1d9b5383d4aca428252f'
* commit 'd3fb418c7c82c47c0b2c1d9b5383d4aca428252f':
SDK Manager: extra packages must respect min-tools-rev too.
2009-10-13 16:57:21 -07:00
Raphael
a55fb39176
am 7fd178a0: am 52eb73d2: Merge change I408e3eda into eclair
...
Merge commit '7fd178a0e0345741cf18bc24ea5e68df2776f6b8'
* commit '7fd178a0e0345741cf18bc24ea5e68df2776f6b8':
SDK Manager: fix selection of non-expanded remote archives.
2009-10-13 16:57:17 -07:00
Jack Palevich
2ad8db7a6d
am edb55982: Fix Terminal Preferences, Resolution
...
Merge commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0'
* commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0':
Fix Terminal Preferences, Resolution
2009-10-13 16:57:13 -07:00
Xavier Ducrohet
0de953622f
am 5e04446c: am 126a1950: Add missing override.
...
Merge commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40'
* commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40':
Add missing override.
2009-10-13 16:57:08 -07:00
Raphael
85427348f5
am da615ec6: am 31d0121f: Fix adt-tests: remove UpdaterLogicTest
...
Merge commit 'da615ec62d1897eee2c36aa20a6e5723bcd40d19'
* commit 'da615ec62d1897eee2c36aa20a6e5723bcd40d19':
Fix adt-tests: remove UpdaterLogicTest
2009-10-13 16:57:04 -07:00
Xavier Ducrohet
1f8dfe220e
am d2560f89: am 4d59d18a: Merge change Ib18a32c1 into eclair
...
Merge commit 'd2560f89dda8adc3226d3aefb429d4b2c07e6bc3'
* commit 'd2560f89dda8adc3226d3aefb429d4b2c07e6bc3':
Minor label change (size -> resolution)
2009-10-13 16:55:10 -07:00
Brett Chabot
9a3d2ef78d
am 2a910437: am d00a9bcf: Merge change I3e6a5048 into eclair
...
Merge commit '2a9104372f9f154b134f5c3386a4f95c8813b89f'
* commit '2a9104372f9f154b134f5c3386a4f95c8813b89f':
Fix ADT tests failures:
2009-10-13 16:54:51 -07:00
Brett Chabot
35f7549076
am 4226ff3e: am 8842cfe4: Merge change Ic77859c7 into eclair
...
Merge commit '4226ff3e30571af63aaf1548305af35607198b5c'
* commit '4226ff3e30571af63aaf1548305af35607198b5c':
Remove flaky ApiDemos tests from continuous.
2009-10-13 16:52:21 -07:00
Raphael
ae8ee4314e
am d61dddbb: am 773e9af6: Merge change Ied6c54f1 into eclair
...
Merge commit 'd61dddbb18c619b6dfc3fd6d67c4baebc513c35f'
* commit 'd61dddbb18c619b6dfc3fd6d67c4baebc513c35f':
Fix continuous adt-test: UpdaterLogic is now public.
2009-10-13 16:52:10 -07:00
Brett Chabot
bcff9211d6
am 0d4f7cd4: am 264d42dd: Merge change Idf5bcb58 into eclair
...
Merge commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681'
* commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681':
Fix ant install when -Dadb.device.arg not provided.
2009-10-13 16:51:55 -07:00
Raphael
7a0cd1629b
am 0c384c58: am b2fa9b71: Merge change I2c7af74e into eclair
...
Merge commit '0c384c581432c64121b53082bc6b348c342dd6f1'
* commit '0c384c581432c64121b53082bc6b348c342dd6f1':
SDK Updater: don't auto-expand archives when selecting a package
2009-10-13 16:51:15 -07:00
Eric Fischer
10a26063d2
Reimport translations.
...
Change-Id: I94f75699909161b4357b1678849e6a45fabe9e7c
2009-10-13 16:28:31 -07:00
Android (Google) Code Review
5836ee0b9e
Merge change I2022dcd9
...
* changes:
Standardized on one single output buffer for all the commands output.
2009-10-13 15:15:12 -04:00
Jack Palevich
3328b18293
am 494bb69b: Merge change I79297bbe into eclair-mr2
...
Merge commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810'
* commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810':
Turn of log message that was accidentally left on in an earlier commit.
2009-10-13 12:11:19 -07:00
Raphael
d9d862c594
am b80add6c: am 3334a587: Fix "android create project" to properly set name in strings.xml
...
Merge commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4'
* commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4':
Fix "android create project" to properly set name in strings.xml
2009-10-13 12:00:33 -07:00
Raphael
cdbd3990e3
am cfd96c9a: am 8eff7f57: Support adb device-targeting arguments in ant scripts.
...
Merge commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1'
* commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1':
Support adb device-targeting arguments in ant scripts.
2009-10-13 12:00:28 -07:00
Xavier Ducrohet
af29bd0741
am ab1b631b: am f40ac8d6: Merge change Ic4387354 into eclair
...
Merge commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142'
* commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142':
Make WVGA/High skins use a higher VM heap size.
2009-10-13 12:00:24 -07:00
Raphael
3c7c84dcff
am 1d85d8d1: am 97a6420d: Merge change I935c71f2 into eclair
...
Merge commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956'
* commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956':
Add sholes to Windows USB Driver in Eclair.
2009-10-13 12:00:20 -07:00
Raphael
f4345a3451
am 9c8f3496: am f3ae13d0: Merge change I7d549c26 into eclair
...
Merge commit '9c8f3496f105d7ebb375a8dc2e39f554e3b16156'
* commit '9c8f3496f105d7ebb375a8dc2e39f554e3b16156':
Add SdkUiLib tests to adt-tests.
2009-10-13 12:00:15 -07:00
Raphael
3f34821b63
am 3dcef76d: am 0947e82e: Merge change Ica46d149 into eclair
...
Merge commit '3dcef76d30e6f2aae495c6236ed29f1b3f8ae421'
* commit '3dcef76d30e6f2aae495c6236ed29f1b3f8ae421':
SDK Updater: platform dependency on tools, addon dependency on platform.
2009-10-13 12:00:11 -07:00
Xavier Ducrohet
79b4670374
am fb00ff8a: am 9cb6feee: Merge change Ia20b55c7 into eclair
...
Merge commit 'fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5'
* commit 'fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5':
Add hardware support to AVD creation dialog.
2009-10-13 12:00:07 -07:00
Jean-Baptiste Queru
d9c661623c
am d410b728: am b7c548eb: am fb244224: merge from donut-gms
...
Merge commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d'
* commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d':
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-13 12:00:03 -07:00
Marco Nelissen
0d0d319f21
am 7b7bdf13: am 32739c61: Merge change I2e026098 into eclair
...
Merge commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a'
* commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a':
Three implementations of a live wallpaper showing a spinning cube.
2009-10-13 11:55:23 -07:00
Android (Google) Code Review
bc7c36728c
Merge change I6dbcafab into eclair
...
* changes:
Fix NPE in the parsing of property file.
2009-10-13 14:41:47 -04:00
Android (Google) Code Review
60e45099aa
Merge change Ibb660dd5 into eclair-mr2
...
* changes:
updating sample plugins to support fixed surface dimensions.
2009-10-13 14:39:26 -04:00
Xavier Ducrohet
73ecae2fdc
Fix NPE in the parsing of property file.
...
this could happen if the log object is null and the parsing fails.
Change-Id: I6dbcafab26c5405efba20b30f511104fcee5bf78
2009-10-13 10:28:16 -07:00
Android (Google) Code Review
f45515ee46
Merge change I800158fb
...
* changes:
Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 12:53:58 -04:00
Raphael
f4fe738d0f
am 96fc3df6: Merge change Ib096f1f0 into eclair
...
Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-mr2
* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-13 09:45:25 -07:00
Nicolas Catania
2022dcd9f1
Standardized on one single output buffer for all the commands output.
...
All the commands output go to an *Android Output* buffer which
gets cleaned up before each command run.
Fixed a compilation bug, building from the top Makefile was not
generating a new image.
2009-10-13 09:10:19 -07:00
Derek Sollenberger
bb660dd555
updating sample plugins to support fixed surface dimensions.
2009-10-13 11:45:47 -04:00
Android (Google) Code Review
96fc3df693
Merge change Ib096f1f0 into eclair
...
* changes:
SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-13 00:38:11 -04:00