Merge commit '250153e8257188269bb171bb333975860bcc1d36' into eclair-mr2-plus-aosp
* commit '250153e8257188269bb171bb333975860bcc1d36':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Merge commit '851c913b6e3cdf7cb334d4b24ae3e1079554203b' into eclair-mr2-plus-aosp
* commit '851c913b6e3cdf7cb334d4b24ae3e1079554203b':
Update adt-tests build.properties to include new test data location.
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-mr2
* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
Update adt-tests build.properties to include new test data location.
Merge commit 'e458201d1ab45d9b72027d3d319d16810bf0b94f' into eclair-mr2-plus-aosp
* commit 'e458201d1ab45d9b72027d3d319d16810bf0b94f':
Fix ADT test data references.
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 '2d2d34086516a36e8d26f927c75b9944fd07b69f' into eclair-mr2-plus-aosp
* commit '2d2d34086516a36e8d26f927c75b9944fd07b69f':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
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 'f0f501ec27a4b37bf06288de808bc083d251921a' into eclair-mr2-plus-aosp
* commit 'f0f501ec27a4b37bf06288de808bc083d251921a':
ADT now launches app as if launched from launcher.
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2
* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.
Merge commit 'e9373a42114a9ed37dbdc68991250bd40f54552f' into eclair-mr2-plus-aosp
* commit 'e9373a42114a9ed37dbdc68991250bd40f54552f':
Move Tools to rev 5, and ADT to 0.9.5
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2
* commit '7853d243aa0f2947249aa610972d74622cdddd82':
Move Tools to rev 5, and ADT to 0.9.5
Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp
* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
Moved values into attributes of xml elements where they belong
Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp
* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
- 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
Merge commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b' into eclair-mr2-plus-aosp
* commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b':
Move check for hidden files in the proper method.
Merge commit 'a3dce5a089e64ac0e52405ae34560392d360e964' into eclair-mr2-plus-aosp
* commit 'a3dce5a089e64ac0e52405ae34560392d360e964':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '35d140afb413e52f0ed43e30d41050348688f2e2' into eclair-mr2-plus-aosp
* commit '35d140afb413e52f0ed43e30d41050348688f2e2':
Ignore hidden files and vi swap files during packaging.
Merge commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a' into eclair-mr2-plus-aosp
* commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a':
Only apply permission to files with +x
