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.
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
Merge commit '6cf05f1c3d6f4585573c8663a62848a09f6a08ff' into eclair-plus-aosp
* commit '6cf05f1c3d6f4585573c8663a62848a09f6a08ff':
Make vCard importer code use Account information if possible.
Merge commit '1f1135a29e7dddae1d813f3d5a39eb57cef2db4a' into eclair-plus-aosp
* commit '1f1135a29e7dddae1d813f3d5a39eb57cef2db4a':
revert to black video background, since we don't need the color-key anylonger
Merge commit '7bf75f6dc4b0b19df2b0365ba760da9dd8e1a4c3' into eclair-plus-aosp
* commit '7bf75f6dc4b0b19df2b0365ba760da9dd8e1a4c3':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Take 2. We needed to check that the usage flags are "good enough" as opposed to "the same".
This reverts commit 8f17a762fe9e9f31e4e86cb60ff2bfb6b10fdee6.
Merge commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8' into eclair-plus-aosp
* commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8':
Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
Merge commit 'd9e28017f6e3da3a176d11fd0c722b1d7811d27b' into eclair-plus-aosp
* commit 'd9e28017f6e3da3a176d11fd0c722b1d7811d27b':
New field in CallerInfo to cache if the call is an emergency one.
Merge commit '6ee7b04d270824214fca0296d0386e0c3d733cdf' into eclair-plus-aosp
* commit '6ee7b04d270824214fca0296d0386e0c3d733cdf':
Some improvements for wallpaper configuration.
Merge commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f' into eclair-plus-aosp
* commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f':
Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
Merge commit '49071af7bd19491f21f23a59621227ef48c11146' into eclair-plus-aosp
* commit '49071af7bd19491f21f23a59621227ef48c11146':
make the window-shade use an opaque surface if possible
Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp
* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp
* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
Allow only System Service to send most Bluetooth intents.
Merge commit '5446ea77bcd7cf3d234f7198d073c99f6519662f' into eclair-plus-aosp
* commit '5446ea77bcd7cf3d234f7198d073c99f6519662f':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb' into eclair-plus-aosp
* commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb':
update for new plugin api
