Commit Graph

2377 Commits

Author SHA1 Message Date
Raphael
5ce23b40e7 am 135ae886: Merge change Idad5a0ab into eclair
Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-plus-aosp

* commit '135ae88641599194c398cd5dbcee535313921f7a':
  SDK: Remove STOPSHIP keyword.
2009-10-14 12:26:57 -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
74620545d2 am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
Merge commit '62437b9984649c80aa3a7d93750efdc5ff206d07' into eclair-plus-aosp

* commit '62437b9984649c80aa3a7d93750efdc5ff206d07':
  Windows SDK: copy SDK Setup.exe at root of SDK.
2009-10-14 11:39:54 -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
Xavier Ducrohet
3f61033c38 am e19c0298: Merge change Idc447b41 into eclair
Merge commit 'e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-plus-aosp

* commit 'e19c02984fd10c9fa35b036aafc1181cb8384069':
  UI to manage/create custom Layout Devices.
2009-10-13 22:57:57 -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
d18f57f976 am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Merge commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60' into eclair-plus-aosp

* commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60':
  Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
2009-10-13 20:47:22 -07:00
Xavier Ducrohet
1225b9c500 am bc7c3672: Merge change I6dbcafab into eclair
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-plus-aosp

* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
  Fix NPE in the parsing of property file.
2009-10-13 20:47:17 -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
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
Raphael
173e5f056c am 96fc3df6: Merge change Ib096f1f0 into eclair
Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-plus-aosp

* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
  SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-12 21:46:50 -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
d804cfe8b9 am 9bdf821f: SDK: Support "android.bat update sdk"
Merge commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268' into eclair-plus-aosp

* commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268':
  SDK: Support "android.bat update sdk"
2009-10-12 15:37:42 -07: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
Raphael
1b928c5a26 am 5ca98eb0: Merge change I5359971f into eclair
Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-plus-aosp

* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
  New "SDK Launcher" for Windows.
2009-10-12 14:23:29 -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
Raphael
0459a7dd1f am 6fb8880a: Merge change I26a21669 into eclair
Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-plus-aosp

* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
  Set SDK Platform/Doc to API 5.
2009-10-12 12:44:21 -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
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
Raphael
29781e895d am e4c98c01: SDK Manager: display packages revisions
Merge commit 'e4c98c0191242cd29712ab54fbe49e8a75f8db0b' into eclair-plus-aosp

* commit 'e4c98c0191242cd29712ab54fbe49e8a75f8db0b':
  SDK Manager: display packages revisions
2009-10-11 10:29:12 -07:00
Raphael
e4c98c0191 SDK Manager: display packages revisions
This changes the short description of all the package types
to display the revision.

It also changes the long description to be "whatever" is in the
XML; if there's nothing in the xml, use the short description.
Also appends the requirements for addon/platform and min-tools-rev.

I will address the packaging script to put proper descriptions
when generating the XML.

SDK BUG 2136068

Change-Id: Iaca7692f048f7f63111c2fe1f25c5588f0fc2099
2009-10-11 10:13:37 -07:00
Raphael
8a378c117f am e7ad6a5e: Merge change I2fb42327 into eclair
Merge commit 'e7ad6a5e40ff032df21e934f1f61c2730de9a16b' into eclair-plus-aosp

* commit 'e7ad6a5e40ff032df21e934f1f61c2730de9a16b':
  SDK Manager: extra packages must respect min-tools-rev too.
2009-10-11 10:02:40 -07:00
Raphael
4c03bfe0d9 am 52eb73d2: Merge change I408e3eda into eclair
Merge commit '52eb73d25ca3ffc2467bca1443752c13bc1bc900' into eclair-plus-aosp

* commit '52eb73d25ca3ffc2467bca1443752c13bc1bc900':
  SDK Manager: fix selection of non-expanded remote archives.
2009-10-11 10:02:34 -07:00
Android (Google) Code Review
e7ad6a5e40 Merge change I2fb42327 into eclair
* changes:
  SDK Manager: extra packages must respect min-tools-rev too.
2009-10-11 12:52:46 -04:00
Android (Google) Code Review
52eb73d25c Merge change I408e3eda into eclair
* changes:
  SDK Manager: fix selection of non-expanded remote archives.
2009-10-11 12:51:53 -04:00
Raphael
26a2166934 Set SDK Platform/Doc to API 5. 2009-10-10 14:16:20 -07:00
Raphael
cce3d0d9ba SDK Manager: extra packages must respect min-tools-rev too.
SDK BUG 2040986

Change-Id: I2fb42327ff6d474fd8ad58fcd0725af3972ea026
2009-10-09 18:45:15 -07:00
Raphael
6f9c5895a7 SDK Manager: fix selection of non-expanded remote archives.
SDK BUG 2177033

Change-Id: I408e3edaa5a418df871ebf0da567468bf81189df
2009-10-09 17:34:30 -07:00
Xavier Ducrohet
9788502d91 am 126a1950: Add missing override.
Merge commit '126a19500c2d7d834d592a79e38ea6a0b678c94c' into eclair-plus-aosp

* commit '126a19500c2d7d834d592a79e38ea6a0b678c94c':
  Add missing override.
2009-10-09 16:02:06 -07:00
Raphael
aff51536b1 am 31d0121f: Fix adt-tests: remove UpdaterLogicTest
Merge commit '31d0121f684fbd5eba4c9ad612b850732b659f40' into eclair-plus-aosp

* commit '31d0121f684fbd5eba4c9ad612b850732b659f40':
  Fix adt-tests: remove UpdaterLogicTest
2009-10-09 16:02:02 -07:00
Xavier Ducrohet
126a19500c Add missing override.
Change-Id: Id9608b8ac9f05c3e0db92668797b2d80f0690397
2009-10-09 15:36:52 -07:00
Raphael
31d0121f68 Fix adt-tests: remove UpdaterLogicTest
Also reverts UpdaterLogic as package-private and
adds some javadoc to it.

SDK BUG 2179267

Change-Id: I19644cc4c99ac70598f3cbcfface2f19d9999931
2009-10-09 14:32:48 -07:00
Xavier Ducrohet
f96afe2b28 am 4d59d18a: Merge change Ib18a32c1 into eclair
Merge commit '4d59d18abaf5546ab1c2cccd11655073df937c18' into eclair-plus-aosp

* commit '4d59d18abaf5546ab1c2cccd11655073df937c18':
  Minor label change (size -> resolution)
2009-10-09 14:28:40 -07:00
Android (Google) Code Review
4d59d18aba Merge change Ib18a32c1 into eclair
* changes:
  Minor label change (size -> resolution)
2009-10-09 17:20:52 -04:00
Brett Chabot
138a51082d am d00a9bcf: Merge change I3e6a5048 into eclair
Merge commit 'd00a9bcffed8fa7cdd4bac8b58c6abe7d6e93adf' into eclair-plus-aosp

* commit 'd00a9bcffed8fa7cdd4bac8b58c6abe7d6e93adf':
  Fix ADT tests failures:
2009-10-09 13:57:52 -07:00
Android (Google) Code Review
d00a9bcffe Merge change I3e6a5048 into eclair
* changes:
  Fix ADT tests failures:  - Separate functional tests into ones which load their own Sdk, vs ones which need to use the same one as Adt.  - Make all base test classes abstract with protected constructors.
2009-10-09 16:45:44 -04:00
Xavier Ducrohet
a4454504a5 Minor label change (size -> resolution)
Also remove unused imports

Change-Id: Ib18a32c126bc913e3e0c14546d2ce693190be1d1
2009-10-09 13:41:56 -07:00
Brett Chabot
126bc43dee Fix ADT tests failures:
- Separate functional tests into ones which load their own Sdk, vs ones which
need to use the same one as Adt.
 - Make all base test classes abstract with protected constructors.

BUG 2173382, 2173847
2009-10-09 12:33:22 -07:00
Brett Chabot
b0228f95c8 am 8842cfe4: Merge change Ic77859c7 into eclair
Merge commit '8842cfe4a1f190906c99896992d1bbb7b144fb90' into eclair-plus-aosp

* commit '8842cfe4a1f190906c99896992d1bbb7b144fb90':
  Remove flaky ApiDemos tests from continuous.
2009-10-09 12:32:14 -07:00
Android (Google) Code Review
8842cfe4a1 Merge change Ic77859c7 into eclair
* changes:
  Remove flaky ApiDemos tests from continuous.
2009-10-09 15:22:43 -04:00
Raphael
ce56d857e7 am 773e9af6: Merge change Ied6c54f1 into eclair
Merge commit '773e9af64537ed16e7353ef13bc309f477c98abd' into eclair-plus-aosp

* commit '773e9af64537ed16e7353ef13bc309f477c98abd':
  Fix continuous adt-test: UpdaterLogic is now public.
2009-10-09 12:22:34 -07:00
Brett Chabot
9cf2f6f137 Remove flaky ApiDemos tests from continuous.
These aren't needed anyway, since they are run as part of SDK test set.

BUG 2081356
2009-10-09 12:20:51 -07:00
Android (Google) Code Review
773e9af645 Merge change Ied6c54f1 into eclair
* changes:
  Fix continuous adt-test: UpdaterLogic is now public.
2009-10-09 15:15:45 -04:00
Brett Chabot
fbf06f4aeb am 264d42dd: Merge change Idf5bcb58 into eclair
Merge commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900' into eclair-plus-aosp

* commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900':
  Fix ant install when -Dadb.device.arg not provided.
2009-10-09 11:52:13 -07:00
Raphael
8e8ad9d39f Fix continuous adt-test: UpdaterLogic is now public.
Also remove the make sdkuilib from create_tests_symlinks, since
adt-tests actually uses the one from adt.

SDK BUG 2177557

Change-Id: Ied6c54f1227ed73fb77723e016559357fc1c1ee2
2009-10-09 11:50:16 -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