Merge commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081' into eclair-mr2-plus-aosp
* commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144' into eclair-mr2-plus-aosp
* commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144':
SDK Updater: don't load sdk-repo XML that failed to validate.
Merge commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad' into eclair-mr2-plus-aosp
* commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad':
Prepare version numbers for next SDK & tools
Merge commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3' into eclair-mr2-plus-aosp
* commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS 2219284 2198427
Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
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
Merge commit '12dac0b13bce0aa19cdc933107e1a733bc62e116' into eclair-mr2-plus-aosp
* commit '12dac0b13bce0aa19cdc933107e1a733bc62e116':
SDK Manager: properly reset tree when changing updates only
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
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
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
Merge commit '0d43991074e178c388b06b2f8984967c140451b9' into eclair-mr2-plus-aosp
* commit '0d43991074e178c388b06b2f8984967c140451b9':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Merge commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair
* commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
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
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
