Commit Graph

259 Commits

Author SHA1 Message Date
Raphael
5df7d75e1c am f4c63fae: SDK Manager support for future schemas.
Merge commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair

* commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
  SDK Manager support for future schemas.
2009-11-16 14:25:49 -08:00
Raphael
f4c63fae0c SDK Manager support for future schemas.
This CL cleans up the v2 test by removing all v2 stuff
from the code right now. We only keep the part that
handles future schemas and right now the latest version is 1.

Change-Id: I31e6aeaf0582e94c67e1cc8317bec479ea7a52e7
2009-11-16 13:59:03 -08:00
Raphael
6dcf42149b resolved conflicts for merge of 0da4f158 to eclair
Fixes a merge eclair-sdk => eclair conflict of
  SDK Manager: phase 1 of support for future schemas
  SDK BUG 2252825

Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8
2009-11-16 13:07:43 -08:00
Raphael
580e982719 SDK Manager: phase 1 of support for future schemas
This is phase 1 of the support for future schemas:
- introduces a new v2 of the XSD
- handles an unknown XSD and extract its tools elements after
  some hand checks.

TODO in phase 2:
- we still need to iron out the details of the sample node.
- there's no support for samples yet... this commit is not
  about switching the sample code support to the new structure.
- there's no indication to the user that we are handling a new
  schema... there should be some visual clue on why only the
  tools are shown.

SDK BUG 2252825

Change-Id: If1bda26414cfe15275063d3187a98be6301d2992
2009-11-16 11:42:28 -08:00
Raphael
e5387db7c2 am d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair

* commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6':
  SDK Manager: fix, create temp folder before download
2009-11-14 14:39:52 -08:00
Raphael
3298a0438e SDK Manager: fix, create temp folder before download
SDK BUG 2258237

Change-Id: I361fb688558539e20af50cd0a1d805ddf4ea4828
2009-11-12 17:15:54 -08:00
Raphael
2d03b2a5d1 am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair

* commit '8ccddf4c00464c6fee998d56da1f08b4662abf62':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 11:59:37 -08:00
Android (Google) Code Review
8ccddf4c00 Merge change Id49751eb into eclair-sdk
* changes:
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-08 13:34:15 -08:00
Android (Google) Code Review
534b520e4a Merge change If5b2f9df into eclair
* changes:
  Fix ADT test data references.
2009-11-07 15:40:26 -05:00
Raphael
28f6fda581 SDK Manager: reuse complete downloads, retry Windows locks.
This resolves 2 main issues with the SDK updater:
- Completed downloads are not cleared till the install is successful
- They are also stored in SDK/temp rather than the real Windows TEMP
  folder, making them more discoverable for savvy users.
- There's a retry loop on failed install when due to a directory
  being locked.
- The retry loop comes with the a Big Fat Warning[tm] in a modal
  dialog box. You can't miss it. And it explicitly mentions the
  antivirus software can be the root cause.

SDK BUG 2235058

Change-Id: Id49751ebd67e7291a0e7005136b22576335729c1
2009-11-06 19:04:28 -08:00
Raphael
3de259034c am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair

* commit '8e3442f1b0fc19c8213978d4e7ac005774462297':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:13:41 -08:00
Android (Google) Code Review
8e3442f1b0 Merge change Ic291d534 into eclair-sdk
* changes:
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 19:06:48 -05:00
Raphael
3e9f34498a SDK Manager: refresh sources when HTTP/S pref is changed.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.

Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
2009-11-06 15:18:57 -08:00
Raphael
bf9a70fb1b am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair

* commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:00:55 -08:00
Raphael
ca4603db2f SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
2009-11-06 13:42:28 -08:00
Brett Chabot
fd893b5fb0 Fix ADT test data references.
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
2009-11-03 12:34:46 -08:00
Xavier Ducrohet
0dd85d89fa Only apply permission to files with +x (do not merge)
integrated from eclair branch.
2009-11-02 12:13:45 -08:00
Android (Google) Code Review
192d5db1fe Merge change Ied3304a0 into eclair
* changes:
  Only apply permission to files with +x
2009-11-02 14:40:10 -05:00
Xavier Ducrohet
67ba2de9e7 Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
2009-10-30 16:34:47 -07:00
Raphael
8a370089b8 am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair

* commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de':
  SDK Manager: Display error when saving settings
2009-10-30 13:01:22 -07:00
Raphael
d3f9eb79c7 SDK Manager: Display error when saving settings
SDK BUG 2226029

Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
2009-10-29 21:28:45 -07:00
Raphael
7a42c8f4d5 am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit 'be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair

* commit 'be4cbcc2267e3778776c68785b52f871f72c67f7':
  SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 14:31:05 -07:00
Raphael
be4cbcc226 SDK Manager: fix NPE in AVD > Start when there's no skin name.
Also log missing config.ini path.

SDK BUG 2223760

Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
2009-10-29 13:52:56 -07:00
Android (Google) Code Review
940073e267 Merge change I28aa1104 into eclair-sdk
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 16:22:26 -04:00
Raphael
93ead92dbb SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
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: I6b97fee06bd4e6dc36c977ffef3c25315469b766
2009-10-29 13:00:11 -07:00
Raphael
34d8e2790b SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
2009-10-29 12:56:16 -07:00
Brett Chabot
a94518e3bc ADT test fixes.
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.

Bugs 2222616, 2218682
2009-10-28 18:22:15 -07: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
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
e7ff49b82d SDK Manager: properly reset tree when changing updates only
SDK BUG 2210573

Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
2009-10-23 13:45:57 -07:00
Raphael
46b5e20d2b SDK Updater: switch UdpateChooserDialog to jface.
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
2009-10-21 12:10:47 -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
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
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
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
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
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
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
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
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
Android (Google) Code Review
4d59d18aba Merge change Ib18a32c1 into eclair
* changes:
  Minor label change (size -> resolution)
2009-10-09 17:20:52 -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
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
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
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
Xavier Ducrohet
3a05612f59 Add hardware support to AVD creation dialog.
Change-Id: Ia20b55c788191b40159b5c38b66f1da333179ccc
2009-10-07 19:52:43 -07:00