Merge commit '40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-plus-aosp
* commit '40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.
Merge commit '7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-plus-aosp
* commit '7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-plus-aosp
* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit '8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-plus-aosp
* commit '8693f82d02fd9b3a805e076fa1eafacd1737446d':
Some work on issue #2286804: sometimes text field doesn't accept input
Merge commit '59c0627841381f47da5cc72e6ff55fa8bad431ed' into eclair-plus-aosp
* commit '59c0627841381f47da5cc72e6ff55fa8bad431ed':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
1. PRIORITY_OFF is when user unchecks A2DP connection profile box.
2. By default, when you bond, it will be PRIORITY_ON.
3. When the profile gets connected, the priority gets set to
PRIORITY_AUTO_CONNECT. This means that we will connect
automatically to this profile.
4. When the user disconnects, we downgrade the priority to PRIORITY_ON,
which means we won't reconnect automatically.
a) We need to make a similar change to Handsfree profile.
b) We need to rework the profile management design and code which
will fix the 6 second timer that we have for A2DP reconnection.
Add AUTO_CONNECT priority for Headset profile.
Also, don't set priority to ON while disconnecting.
This logic has been pushed up to the Settings app.
Dr No: Eastham
Bug: 2133530
This doesn't really fix the problem being brought up here, but fixes a
related issue I found while investigating it -- if you tap a text view
enough to cause it to try to scroll, this will cause the touch to become
a scroll instead of a click, even if there is nothing to scroll. So
often quick taps to bring up the IME would be canceled because they
became a non-scroll.
Unfortuntately after syncing the latest build, I was having a lot of
trouble reproducing the original problem. I think I need to punt it to
MR2 at this point.
Change-Id: If1f0bf33de1b4d71c9f677cdad07639b7a3fb772
Merge commit 'a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-plus-aosp
* commit 'a80a75f34a98fe1e41afab93c97aca505939903a':
Register Handsfree profile before headset profile. DO NOT MERGE.
There is a delay between registering the two profiles,
and handsfree profile is a superset of the headset profile.
So some devices do an SDP and get the headset profile record
before we have registered the handsfree profile.
a) We can reject all incoming connections till all profiles are
registered, but then this would mean we connect later in some cases.
Registering profiles in this order seems fine to me.
Note: There is a also the need to fix forking sdptool to register
profiles, which would obliviate the need to wait 500 msecs between
profile registrations.
Bug: 2293792
Dr No: Eastham
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-plus-aosp
* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
* changes:
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-plus-aosp
* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
In this case, as opposed to what was happening in 1977685, the focused view wasn't the one that was
directly removed, it was a child of the removed view.
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-plus-aosp
* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Also sets an explicit type for GeolocationPermissions.getOrigins.
This is a partial fix for bug http://b/issue?id=2271636
This has already been submitted to eclair-mr2.
Change-Id: I0c77eca94eb56d16c2a9a29a72eb221e4a7a52a6
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-plus-aosp
* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
This change applies the fix -- originally by phanna in
https://android-git.corp.google.com/g/#change,33669 -- to
the com.android.internal.widget version of DigitalClock,
which is used by the keyguard and pattern lock screens.
Change-Id: I43f72dd144423e55f73ba52903d52163c8f65591
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-plus-aosp
* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
The detach of the wallpaper engine was coming in after the containing
service was destroyed. This was possible because these are different
IPC interfaces so will not be serialized. The fix is to keep track
of all of the active engines in the serice, and detach any remaining
ones when the service is destroyed.
Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-plus-aosp
* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-plus-aosp
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
