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 '6a1ae64f7735a3817713a223096bf8034f78a620'
* commit '6a1ae64f7735a3817713a223096bf8034f78a620':
Fix another HTML formatting in android.os.AsyncTask
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>
Merge commit '9a81736176f507489f262344b6e3d55bbe53be7c'
* commit '9a81736176f507489f262344b6e3d55bbe53be7c':
Add the ability to specify the onClick handler with XML. The new android:onClick attribute defines the name of the method in the Activity to invoke when the button is clicked. The method has to be public and get one View parameter.
Merge commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd'
* commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd':
TypedProperties: add getStringInfo() to help deal with null strings
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9'
* commit '52a3cb53ddcce049d2e804c3042514df576cb5b9':
TypedProperties: change the file format to be a subset of Java
Merge commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c'
* commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c':
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
* changes:
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
Also adjust based on comments:
+ changed service intent string to conform to usage guidelines
+ only publish the IBackupService binder when invoked with the right
intent action
+ docs tweaks
Also tweak the dataChanged() api to have the client supply a package name. We
don't necessarily TRUST this, but we use it to narrow the set of packages requesting
a backup pass, no longer blithely scheduling a pass for all packages associated
with the caller's uid.
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'
* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
Allow access to global search by pressing the hard search button again
* changes:
Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
within in-app search. If within in-app search and toggled out to global
search, pressing the hard search button will take the user *back* into
in-app search too.
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'
* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
AI 147994: First cut of CharsetUtils, a utility class that aims to
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut
* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
AI 147994: First cut of CharsetUtils, a utility class that aims to
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'
* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
AI 148024: fix NPE when there is no history
