Merge commit '724561cc20e259888986cbb0be2fdab4d142d869'
* commit '724561cc20e259888986cbb0be2fdab4d142d869':
Fixes external #2575 (http://code.google.com/p/android/issues/detail?id=2575). HorizontalScrollView was comparing the measured height of its child to its width.
Merge commit '7ff943673e48a912eb7cc5add08e206c2c25d68e'
* commit '7ff943673e48a912eb7cc5add08e206c2c25d68e':
Debug: Add setPropertiesOn(), and @hide it for now
Merge commit '5c6f93f1422647c7f914a15bfad00992685c3eac'
* commit '5c6f93f1422647c7f914a15bfad00992685c3eac':
AI 148270: remove references to AbsoluteLayout because it's been deprecated
Merge commit '6a1ae64f7735a3817713a223096bf8034f78a620'
* commit '6a1ae64f7735a3817713a223096bf8034f78a620':
Fix another HTML formatting in android.os.AsyncTask
Merge commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18' into donut
* commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18':
AI 148270: remove references to AbsoluteLayout because it's been deprecated
Merge commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38'
* commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38':
Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
Merge commit '854c8c78c1bce214f6479772d94147070ec6764f'
* commit '854c8c78c1bce214f6479772d94147070ec6764f':
make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen.
Copy 3.xml to 4.xml, and patch 4.xml to deal with the fact that
Config.DEBUG's value is no longer actually fixed. We don't want
to modify 3.xml directly, because it's the official cupcake API.
Update current.xml to reflect the differences between 3.xml and 4.xml
and to reflect the new deprecation states.
The deprecated fields should be @hidden if possible before the
next API release, but it can't be done yet because there are
SDK-linked platform apps that use some of the deprecated fields.
Signed-off-by: Dave Bort <dbort@android.com>
related to issue http://b/issue?id=1782245
- fixes 7bit ASCII encode and decode (previous completely broken)
- also consolidates encoding of user data, and changed to match
the conventions of the new data coding -- previously likely
broken for several cases
Merge commit '75e44a1c72c5e6ebf68601bbb903fa3e375bd7d5'
* commit '75e44a1c72c5e6ebf68601bbb903fa3e375bd7d5':
AI 148197: Add a link in "Community" page to the android market discussion forum.
Merge commit 'a417ee5afa8133d42d76691d6501741dc6c7178d' into donut
* commit 'a417ee5afa8133d42d76691d6501741dc6c7178d':
AI 148197: Add a link in "Community" page to the android market discussion forum.
Merge commit '4f508936342dd866d1183ca418ca091437a5ddf6'
* commit '4f508936342dd866d1183ca418ca091437a5ddf6':
AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
Merge commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de' into donut
* commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de':
AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
Merge commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e'
* commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e':
location: Add support for location providers outside of the system process.
Also added new permissions android.permission.INSTALL_LOCATION_PROVIDER
and android.permission.INSTALL_LOCATION_COLLECTOR to the public API.
Signed-off-by: Mike Lockwood <lockwood@android.com>
