Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-mr2
* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
Update adt-tests build.properties to include new test data location.
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2
* commit '534b520e4add964f75cf6a8a612b54916d46da2e':
Fix ADT test data references.
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
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
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-mr2
* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
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.
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2
* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2
* commit '7853d243aa0f2947249aa610972d74622cdddd82':
Move Tools to rev 5, and ADT to 0.9.5
- 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.
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
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
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS 2219284 2198427
Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS