Merge commit 'cf229bb013317db77034980c212ab07bea260261' into eclair-plus-aosp
* commit 'cf229bb013317db77034980c212ab07bea260261':
make consistent with new RegisteredServicesCache API
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-plus-aosp
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
Merge commit 'f702fa413273d175ba499bcb9bd352d208621d95' into eclair-plus-aosp
* commit 'f702fa413273d175ba499bcb9bd352d208621d95':
Fix type of _id col in SearchableDictionary
Merge commit '7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-plus-aosp
* commit '7e56f226f745c2397b2cec4d0da1f61276e1b150':
Add Japanese font to SDK.
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-plus-aosp
* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
Update adt-tests build.properties to include new test data location.
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-plus-aosp
* 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-plus-aosp
* 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-plus-aosp
* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-plus-aosp
* commit '7853d243aa0f2947249aa610972d74622cdddd82':
Move Tools to rev 5, and ADT to 0.9.5
Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-plus-aosp
* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
create a test app that allows direct control of a sync adapter for testing purposes
Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-plus-aosp
* commit '421e8d3353de606444e5350d8feeee8c01c90394':
Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair
* commit '7f305ce77069cf8432374f12392a3ce3a476bdce':
Ignore hidden files and vi swap files during packaging. (do not merge)
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
- 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 '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-plus-aosp
* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-plus-aosp
* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-plus-aosp
* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-plus-aosp
* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Merge commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-plus-aosp
* commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538':
Remove calendar provider suite from continuous. DO NOT MERGE
