Commit Graph

1243 Commits

Author SHA1 Message Date
Raphael
e53083bc68 am 107b1a9e: Merge change Ie496edfa into eclair
Merge commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-plus-aosp

* commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
  SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-27 18:05:55 -07:00
Android (Google) Code Review
107b1a9ee6 Merge change Ie496edfa into eclair
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-27 20:57:02 -04:00
Raphael
1de51457fa SDK Updater: don't load sdk-repo XML that failed to validate.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
2009-10-27 17:48:16 -07:00
Raphael
99a08b066c am 09c5201a: Prepare version numbers for next SDK & tools
Merge commit '09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-plus-aosp

* commit '09c5201adca0ceb0e881832d53cfa9e412d07389':
  Prepare version numbers for next SDK & tools
2009-10-27 17:44:42 -07:00
Raphael
09c5201adc Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
2009-10-27 15:33:17 -07:00
Raphael
7165792b6a am b3bca018: Merge change I337b2644 into eclair
Merge commit 'b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-plus-aosp

* commit 'b3bca018783a0621b981ec8eb98dbbd15f450677':
  SDK Manager > AVD > Start: print computed scale.
2009-10-26 16:25:40 -07:00
Android (Google) Code Review
b3bca01878 Merge change I337b2644 into eclair
* changes:
  SDK Manager > AVD > Start: print computed scale.
2009-10-26 19:12:43 -04:00
Xavier Ducrohet
ae35dfec1f am a73e4f9a: Merge change I7f60270f into eclair
Merge commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-plus-aosp

* commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
2009-10-26 14:25:34 -07:00
Xavier Ducrohet
d5f6e05716 ADT/GEL: Reenable config popup when switching from a device with only 1 config
Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37
BUG: 2218975
2009-10-26 13:55:27 -07:00
Raphael
87636aef44 SDK Manager > AVD > Start: print computed scale.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.

Change-Id: I337b264437dee81aed1bb9a1fbd11ccc9f506e88
2009-10-26 12:26:27 -07:00
Raphael
884c457885 am e7ff49b8: SDK Manager: properly reset tree when changing updates only
Merge commit 'e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-plus-aosp

* commit 'e7ff49b82da151037ef5f221a95b95c897deab30':
  SDK Manager: properly reset tree when changing updates only
2009-10-23 13:56:41 -07:00
Raphael
e7ff49b82d SDK Manager: properly reset tree when changing updates only
SDK BUG 2210573

Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
2009-10-23 13:45:57 -07:00
Dirk Dougherty
e22f0d88fa am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d' into eclair-plus-aosp

* commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d':
  doc change only: update gae python server script (tested)
2009-10-22 11:31:04 -07:00
Raphael
0b0f2566b5 am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2' into eclair-plus-aosp

* commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:31:00 -07:00
Dirk Dougherty
52508ffa96 am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53' into eclair

* commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53':
  doc change only: update gae python server script (tested)
2009-10-22 11:21:34 -07:00
Raphael
a16a134a86 am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair

* commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:20:33 -07:00
Raphael
c289bed4c0 am f6f2d37d: Merge change I03351f1b into eclair
Merge commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-plus-aosp

* commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954':
  SDK Updater: switch UdpateChooserDialog to jface.
2009-10-22 11:12:11 -07:00
Dirk Dougherty
aa95bfe2ac doc change only: update gae python server script (tested) 2009-10-21 18:36:20 -07:00
Android (Google) Code Review
5d2a01adfe Merge change I235da4a8 into eclair-sdk
* changes:
  SDK android "update project" must not require --target parameter.
2009-10-21 16:09:28 -04:00
Raphael
842122bcf9 SDK android "update project" must not require --target parameter.
SDK BUG 2203846

Change-Id: I235da4a8892de9a4334d5630667484220472f168
2009-10-21 12:52:11 -07:00
Raphael
46b5e20d2b SDK Updater: switch UdpateChooserDialog to jface.
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
2009-10-21 12:10:47 -07:00
Raphael
33edc96d1e am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-plus-aosp

* commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99':
  SDK Updater: UI polish
2009-10-20 15:42:36 -07:00
Raphael
a4913107bc am d75c03e4: am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe' into eclair-plus-aosp

* commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe':
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 15:42:32 -07:00
Raphael
e97d99d02c am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit 'd58cd1b5d3bfc2433201fbe22621f4924a89c04d' into eclair

* commit 'd58cd1b5d3bfc2433201fbe22621f4924a89c04d':
  SDK Updater: UI polish
2009-10-20 15:32:13 -07:00
Raphael
d75c03e4f1 am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '7c1adfe76fbf89cc76ff51bf0d228c13213fe563' into eclair

* commit '7c1adfe76fbf89cc76ff51bf0d228c13213fe563':
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 15:32:09 -07:00
Android (Google) Code Review
d58cd1b5d3 Merge change I075d2eae into eclair-sdk
* changes:
  SDK Updater: UI polish
2009-10-20 18:18:18 -04:00
Android (Google) Code Review
7c1adfe76f Merge change I5b1f8bca into eclair-sdk
* changes:
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 18:16:59 -04:00
Raphael
ab36793247 AVD Manager: Properly disable AVD > Start > ? under Windows
SDK BUG 2201546

Change-Id: I5b1f8bcaf57f2e7f94b4109cb62a3a5eadcd24a9
2009-10-20 15:09:56 -07:00
Raphael
301eea2962 SDK Updater: UI polish
Fixes the following issues:
- Updater says it didnd't install addon and then install it
  (cause: UpdaterData was looking for an ArchiveInfo in a map of Archive)
- Added a label explaining the [*] in the dependency list.
- Added the originating site to the long description in the package chooser.
- Display downloading/installing comments in the result window.
- Fixed app name in dialog when tools are updated.

Change-Id: I075d2eaeb357f33671f7e9e70a906ca48000908d
2009-10-20 14:54:30 -07:00
Raphael
8d10fa07ec am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-plus-aosp

* commit '90b60a3985d07f6113d91737fcd37da2d282ce8f':
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 13:30:08 -07:00
Raphael
97050d6254 am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy.
Merge commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-plus-aosp

* commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
  Android.bat: remove /O in xcopy.
2009-10-20 13:30:02 -07:00
Raphael
90b60a3985 am c9b04450: Merge change I4151529e into eclair-sdk
Merge commit 'c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair

* commit 'c9b04450ef204e03de3f3da886cd45808550dfbc':
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 13:19:58 -07:00
Raphael
bf2cc38e5b am 5708d157: Android.bat: remove /O in xcopy.
Merge commit '5708d1576b3e19601804ea7dfffdee3da6c0c00d' into eclair

* commit '5708d1576b3e19601804ea7dfffdee3da6c0c00d':
  Android.bat: remove /O in xcopy.
2009-10-20 13:19:54 -07:00
Android (Google) Code Review
c9b04450ef Merge change I4151529e into eclair-sdk
* changes:
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 16:13:50 -04:00
Raphael
4ed80aea34 Fix potential NPE in manifest editor when switching SDKs
The UiElementNode depends on the target to compute the
description and it's entirely possible for the target to
be null while the SDK is being unloaded/reloaded.

SDK BUG 2196260

Change-Id: I4151529ea3b6a65eade47d03e55fc93cad8596d9
2009-10-20 12:59:15 -07:00
Raphael
5708d1576b Android.bat: remove /O in xcopy.
It means "copy ownership". But on the Vista 64 box in the lab,
it make the xcopy of lib/x86/swt.jar fail the next time when it
was already present.

SDK BUG 2198636
2009-10-20 12:16:51 -07:00
Xavier Ducrohet
ae126fa926 am 302e013b: am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b' into eclair-plus-aosp

* commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b':
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:46:51 -07:00
Xavier Ducrohet
302e013b6a am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair

* commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913':
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:37:11 -07:00
Android (Google) Code Review
fc5b5aecde Merge change I1a00abb0 into eclair-sdk
* changes:
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 17:24:34 -04:00
Xavier Ducrohet
1a00abb0ae Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time. 2009-10-19 12:56:57 -07:00
Raphael
b0cd32b1cb am 2a13cc20: SDK Updater: properly update/install doc.
Merge commit '2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60' into eclair-plus-aosp

* commit '2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60':
  SDK Updater: properly update/install doc.
2009-10-16 18:08:02 -07:00
Raphael
5cff81bb58 SDK Updater: properly update/install doc. (do not merge)
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
  provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
  to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
  present.
- fixes an edge case when displaying the very long description of the
  docs package, i.e. need to indicate it is upgraded due to a version
  change.

SDK BUG 2192352
2009-10-16 17:50:37 -07:00
Xavier Ducrohet
af49663340 Add save/load for the user-made Layout Devices. (do not merge)
Also added support for mcc/mnc in the schema.
2009-10-16 17:49:45 -07:00
Raphael
2a13cc201a SDK Updater: properly update/install doc.
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
  provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
  to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
  present.
- fixes an edge case when displaying the very long description of the
  docs package, i.e. need to indicate it is upgraded due to a version
  change.

SDK BUG 2192352

Change-Id: I87eda018b450ca9973e4f3b55caef964c0b31480
2009-10-15 16:56:56 -07:00
Raphael
8c6eba1cd3 am 97eef6fd: Merge change Ifb00e723 into eclair
Merge commit '97eef6fdf0a26287dc7161b68f0978a691c175bb' into eclair-plus-aosp

* commit '97eef6fdf0a26287dc7161b68f0978a691c175bb':
  Actively remove the obsolete sdkuilib symlink.
2009-10-15 15:22:07 -07:00
Raphael
511537dcf3 Actively remove the obsolete sdkuilib symlink.
Some of the build servers still have the link and it
breaks continuous tests.

SDK BUG 2177557

Change-Id: Ifb00e7234c9c356c1ffd4aa1aff73f6761a655dc
2009-10-15 15:09:07 -07:00
Xavier Ducrohet
e67fb832ef am bc3c3394: Merge change I8a2d2379 into eclair
Merge commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e' into eclair-plus-aosp

* commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e':
  Add save/load for the user-made Layout Devices.
2009-10-15 14:19:26 -07:00
Android (Google) Code Review
bc3c3394fb Merge change I8a2d2379 into eclair
* changes:
  Add save/load for the user-made Layout Devices.
2009-10-15 16:18:31 -04:00
Xavier Ducrohet
ba9c8dcdf0 Add save/load for the user-made Layout Devices.
Also added support for mcc/mnc in the schema.

Change-Id: I8a2d23797ec57eec69dc1d7218b01cd679634068
2009-10-15 13:06:35 -07:00
Xavier Ducrohet
4b7d624a64 am 8dd4e92c: Merge change I74fdf8c6 into eclair
Merge commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789' into eclair-plus-aosp

* commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789':
  Fix device dpi handling in the Layout device parsing/UI.
2009-10-14 16:07:23 -07:00