Merge commit '0abc859e14fe557479cab490493e64ca6ab05e6e' into eclair-plus-aosp
* commit '0abc859e14fe557479cab490493e64ca6ab05e6e':
Show keyboard automatically in EditTextPreference dialogs
Merge commit '4f8bb4c8a0ec6fa89857281537ad0c5d12bcff47' into eclair-plus-aosp
* commit '4f8bb4c8a0ec6fa89857281537ad0c5d12bcff47':
Use separate resources to control orientation change for car and desk docks.
Merge commit '9f28d9008b96a1f7f3fd14634664d3991d756abf' into eclair-plus-aosp
* commit '9f28d9008b96a1f7f3fd14634664d3991d756abf':
Don't scroll on load if titlebar is visible
Merge commit 'f7c3679f898cdcb208bc1675c79573e1d637083a' into eclair-plus-aosp
* commit 'f7c3679f898cdcb208bc1675c79573e1d637083a':
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
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 '2a66eee3ef88bdc7167e5e5d0471c1e8b2e68fc6' into eclair-plus-aosp
* commit '2a66eee3ef88bdc7167e5e5d0471c1e8b2e68fc6':
Remove deadlock in PackageManager when installing or upgrading packages.
* changes:
Remove deadlock in PackageManager when installing or upgrading packages. PM first creates a temporary file from the input package uri before installing it. if the package uri points to a content uri, the content provider has to be retrieved via the ActivityManager which could cause deadlocks with the package manager locks being held. Clean up by always copying or creating temporary files before acquiring these locks. Fix issue when restoring a failed upgrade for third party apps.
Also set default values to -1 (no orientation change).
Specific products should use overlays to customize dock orientation behavior.
Change-Id: Iae26939295842b9ac2f48fdcc23ea01dafec10fe
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp
* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
Fix bug 2115258 where the AudioManager javadoc doesn't warn against
Merge commit '57384101b9757b1c67570fae60cdb8f89c84bf32' into eclair-plus-aosp
* commit '57384101b9757b1c67570fae60cdb8f89c84bf32':
Use Resources to load search icons with android.resource URIs
* changes:
Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
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 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp
* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
Clean ExifInterface. Prepare to make it public.
Merge commit '8e9ef0e78970d0ca399bd3c9aaf9011f0e4aaebe' into eclair-plus-aosp
* commit '8e9ef0e78970d0ca399bd3c9aaf9011f0e4aaebe':
Add the hide for the inner class definition.
Merge commit '4337476a6669ce52549ce4a60f5e4d07f8e3033f' into eclair-plus-aosp
* commit '4337476a6669ce52549ce4a60f5e4d07f8e3033f':
Fix the missing part for reading enterprise fields in wifi configuration
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
