Merge commit '5f78786cf9802b988a4de3c08555eb43f1e02e04' into eclair-plus-aosp
* commit '5f78786cf9802b988a4de3c08555eb43f1e02e04':
add the ability to do a newAssert with no values
Merge commit '32c687c20d6ac3080b396787147892dc85126b33' into eclair-plus-aosp
* commit '32c687c20d6ac3080b396787147892dc85126b33':
Change Theme.Light's background back to pure white.
Merge commit '4295613a0ea1f61398d3123746740ca27d9ea170' into eclair-plus-aosp
* commit '4295613a0ea1f61398d3123746740ca27d9ea170':
Allow touches to change the selection in WebTextView.
Merge commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60' into eclair-plus-aosp
* commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60':
Fix a handful of bugs in the ContactHeaderWidget
Merge commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79' into eclair-plus-aosp
* commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79':
slide the title if the site changes the scroll position
Slide the title away if the scroll is to zero or one, and the
title is partially or fully visible. Set the animation time
to at least SLIDE_TITLE_DURATION, currently set to 300 ms.
Merge commit '9092ab4d458ad60b459d5fad52368bde5d25f665' into eclair-plus-aosp
* commit '9092ab4d458ad60b459d5fad52368bde5d25f665':
Add support for launching activities when attaching to a car or desk dock.
Categories CATEGORY_CAR_DOCK and CATEGORY_DESK_DOCK can be assigned to
activities to make them launchable on docked events.
This is a better mechanism than listening for ACTION_DOCK_EVENT with a broadcast receiver.
Change-Id: Ic5f3ab3555ce02ca922bc31ebba41978cefe8bda
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '764916d01b779ccc8064946c6ba2962fe063ed86' into eclair-plus-aosp
* commit '764916d01b779ccc8064946c6ba2962fe063ed86':
Combine the "Permission Requested" title and subtitle into one string.
Merge commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8' into eclair-plus-aosp
* commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8':
Add new Gservices setting for discarding uphill ops for eclair and future devices.
Fix http://b/issue?id=2019857
If the user has not moved beyond the scaled touch slop, do not
turn it into a scroll, so the user can change the selection.
Change-Id: I1d88691a35ea2da4b03ad713b56331b5c268b757
Merge commit '0abc859e14fe557479cab490493e64ca6ab05e6e' into eclair-plus-aosp
* commit '0abc859e14fe557479cab490493e64ca6ab05e6e':
Show keyboard automatically in EditTextPreference dialogs
Merge commit '9f28d9008b96a1f7f3fd14634664d3991d756abf' into eclair-plus-aosp
* commit '9f28d9008b96a1f7f3fd14634664d3991d756abf':
Don't scroll on load if titlebar is visible
If the restore requests a scroll to zero and the titlebar is
partially or fully visible, skip the scroll altogether.
This fixes http://b/issue?id=2123079
Merge commit '57384101b9757b1c67570fae60cdb8f89c84bf32' into eclair-plus-aosp
* commit '57384101b9757b1c67570fae60cdb8f89c84bf32':
Use Resources to load search icons with android.resource URIs
Before, all icon URIs were opened with
ContentResolver.openInputStream(Uri), but that does not
include the density information from the source
application.
Now, if the URI uses the android.resource scheme,
we resolve the URI to a Resources and a resource ID,
and load it with Resources.getDrawable(int).
This requires making OpenResourceIdResult and getResourceId()
in ContentResolver public (but hidden).
This change also caches icons that were specified using just a
resource ID.
Since loading a Drawable from a URI is a generally useful operation,
it would be good to make it easy for apps to do it in the proper
density-independent way. We could add a getDrawable(Uri)
method to the framework. The question is where.
It would be easiest to add it to ContentResolver, but that may be a
bit odd since there is no other code for dealing with Drawables in
ContentResolver. Another alternative is in Resources, since
getDrawable(int) is there, but that class deals with the resources
for a single app, whereas getDrawable(Uri) can open a drawable
from any app. Putting it in Context may be the best choice,
since that's in android.content, and can thus access package
private members in ContentResolver, and since it's already
a dumping place for random useful high-level methods.
Opinions?
Fixes http://b/issue?id=2034526
"Icons on search do not scale for wide VGA"
Change-Id: I44de0b74826e5560141a3174bcbba991ba6264ac
Merge commit '46ad796186bdca8bac75607340aa0fac0c34a9d8' into eclair-plus-aosp
* commit '46ad796186bdca8bac75607340aa0fac0c34a9d8':
Unhide cancelAutoFocus API in Camera.
Merge commit '85628188e74c015060e7f315560e659e53294775' into eclair-plus-aosp
* commit '85628188e74c015060e7f315560e659e53294775':
Flag indicating if Contacts source has any unsynced groups.
Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp
* commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da':
Implement issue #1780928: Need support hiding nav keys.
This implements support for devices whose hardware can hide
their navigation keys. It works much like the existing keyboardHidden
configuration, and for compatibility uses the same configuration
change bit.
Also add FLAG_TURN_ON_SCREEN for windows, which has the system
cause the screen to be turned on when the window is displayed.
Great fun when used with FLAG_SHOW_WHEN_LOCKED!
Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
Merge commit '6cf05f1c3d6f4585573c8663a62848a09f6a08ff' into eclair-plus-aosp
* commit '6cf05f1c3d6f4585573c8663a62848a09f6a08ff':
Make vCard importer code use Account information if possible.
Merge commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8' into eclair-plus-aosp
* commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8':
Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
