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 '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
This change adds a sketched outline of the backup system architecture, with
all of the major pieces represented other than client-side helpers for
specific types of data. IBackupManager and BackupService are public so that
we can write test apps against SDK-domain symbols from the outset.
What code exists in this change hasn't been tested and may crash. It's the
beginnings of the real implementation but of course is barely begun.
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'
* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
Allow caller-supplied column aliases in queries even when a projection map is used.
Merge commit '649b1c6ec317b6dd61a385df911e7fe543c5871a'
* commit '649b1c6ec317b6dd61a385df911e7fe543c5871a':
CheckedTextView is abstract but can be inflated from XML. Let's be consistent and allow it to be used from Java code as well by making it non-abstract.
Merge commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3'
* commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3':
Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.
Merge commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4'
* commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4':
AI 147803: add docs and images for docs on Toast and Notification docs
Merge commit 'af3289e4448971b38ae4e95269401452dbc6077e'
* commit 'af3289e4448971b38ae4e95269401452dbc6077e':
AI 147438: add app widget docs to dev guide
Merge commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b'
* commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b':
Fix back key and ime behavior for search dialog.
