Commit Graph

1191 Commits

Author SHA1 Message Date
Raphael
ab34bb51a9 am 5bb5b9ae: am 135ae886: Merge change Idad5a0ab into eclair
Merge commit '5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff'

* commit '5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff':
  SDK: Remove STOPSHIP keyword.
2009-10-14 15:35:16 -07:00
Android (Google) Code Review
135ae88641 Merge change Idad5a0ab into eclair
* changes:
  SDK: Remove STOPSHIP keyword.
2009-10-14 15:16:28 -04:00
Raphael
44098d157c SDK: Remove STOPSHIP keyword.
Change-Id: Idad5a0ab0f31c3e513ce19d914e2eb686078d44f
2009-10-14 12:11:56 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
Raphael
9bdf821fc1 SDK: Support "android.bat update sdk"
This ammends the batch file to recognize "android update sdk" to start
the updater UI.

SDK BUG 2173128 2173150

Change-Id: I3a2b9df9a3c52aa86bf34d05389c4034d60d57dc
2009-10-12 15:20:52 -07:00
Android (Google) Code Review
5ca98eb008 Merge change I5359971f into eclair
* changes:
  New "SDK Launcher" for Windows.
2009-10-12 17:13:23 -04:00
Raphael
e0a265f558 SDK Manager: suggest install of new platforms, addons or extra packages.
Supports the new "android update sdk" action.

Change-Id: Ib096f1f024639018252c58d4f9c8872ead3c39b9
2009-10-12 14:00:45 -07:00
Xavier Ducrohet
62698e3511 am e3ec490a: am 211195d1: Merge change I0d2bc2d1 into eclair
Merge commit 'e3ec490a410978ee7bd5ce67b378974435e53a53'

* commit 'e3ec490a410978ee7bd5ce67b378974435e53a53':
  New based dialog class.
2009-10-12 12:38:10 -07:00
Android (Google) Code Review
6fb8880a48 Merge change I26a21669 into eclair
* changes:
  Set SDK Platform/Doc to API 5.
2009-10-12 15:36:08 -04:00
Romain Guy
0b9c3dfb38 am ca69cda6: am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.
Merge commit 'ca69cda6f8c4c098dbd178929322d53646215339'

* commit 'ca69cda6f8c4c098dbd178929322d53646215339':
  Fix the MergeRootFrameLayout rule by checking the presence of padding.
2009-10-12 12:33:32 -07:00
Xavier Ducrohet
4fe754022a am c8546767: am 7ce7a783: Merge change I47bf273a into eclair
Merge commit 'c85467672fe53721222828b458716f9f9303808d'

* commit 'c85467672fe53721222828b458716f9f9303808d':
  Update AVD creation UI to be easier for skin/sdcard.
2009-10-12 12:33:27 -07:00
Xavier Ducrohet
140bb97828 am 1a3566d5: am 740e6ef0: Merge change Iafd22833 into eclair
Merge commit '1a3566d530930679e8e025d2f869d015ab1cfe86'

* commit '1a3566d530930679e8e025d2f869d015ab1cfe86':
  Add git ignore file for ninepatch eclipse project.
2009-10-12 12:33:22 -07:00
Romain Guy
0f00352243 am ad1af627: am ece784c5: Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
Merge commit 'ad1af627ea393b2ba295daa58bccceab69a0452d'

* commit 'ad1af627ea393b2ba295daa58bccceab69a0452d':
  Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
2009-10-12 11:48:55 -07:00
Xavier Ducrohet
7d13d4319f am 09c9ce61: am b5c18403: Merge change Idc3d3b2f into eclair
Merge commit '09c9ce619c4f51de2b4c4e42eecea33065dc0c97'

* commit '09c9ce619c4f51de2b4c4e42eecea33065dc0c97':
  Moved the test data to their own package.
2009-10-12 11:46:21 -07:00
Romain Guy
5cd8a0b57d am 0a4a1a54: am 2aaa22e0: Merge change Id7515f9a into eclair
Merge commit '0a4a1a549bd8bb9cd7d5002aada9bd42396956d3'

* commit '0a4a1a549bd8bb9cd7d5002aada9bd42396956d3':
  New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
2009-10-12 11:45:45 -07:00
Xavier Ducrohet
585f26db2d am be4c214e: am 8f242703: Merge change I56443773 into eclair
Merge commit 'be4c214e448191fff13eb749991d82409df4ba1e'

* commit 'be4c214e448191fff13eb749991d82409df4ba1e':
  Add support for loading 9-patch from a stream.
2009-10-12 11:45:40 -07:00
Xavier Ducrohet
a57e3ddde3 am 80954af3: am 89482588: Merge change Iddb7f466 into eclair
Merge commit '80954af3113209f033334762ad98d82f15635994'

* commit '80954af3113209f033334762ad98d82f15635994':
  Put kxml back in adt-test
2009-10-12 11:45:36 -07:00
Romain Guy
a6a360f2dd am 8e2c6026: am 16a56b8c: Fix NPE in layoutopt when trying to open non-XML files.
Merge commit '8e2c602625c12e93ef9e4891e90d1737c90c0eba'

* commit '8e2c602625c12e93ef9e4891e90d1737c90c0eba':
  Fix NPE in layoutopt when trying to open non-XML files.
2009-10-12 11:41:58 -07:00
Raphael
7805c44caf New "SDK Launcher" for Windows.
This simple .exe will sit at the root of the Windows SDK
and currently simply executes tools\android.bat

It uses the same icon as the emulator.

Eventually it should simply replace the batch file.

Change-Id: I5359971fd476d6809d4ccb6bc0a0bcd34e30a3e6
2009-10-12 11:38:58 -07:00
Xavier Ducrohet
030b98cf62 am 1651a351: am 67d9bcdf: Only create folder if not present.
Merge commit '1651a351c0b7159c88dbc8145d1d24f06e340718'

* commit '1651a351c0b7159c88dbc8145d1d24f06e340718':
  Only create folder if not present.
2009-10-12 11:37:30 -07:00