Merge commit 'db6d939d2bbf457b1caa5479a60dae5e90d023e1' into eclair-plus-aosp
* commit 'db6d939d2bbf457b1caa5479a60dae5e90d023e1':
if the cursor and focus don't match, match them on text view clicks
Merge commit 'df344375a93f3bfe0360f5436c0866f44b7fb6cc' into eclair-plus-aosp
* commit 'df344375a93f3bfe0360f5436c0866f44b7fb6cc':
compute Y scroll max by scaling only, ignoring title bar height
Merge commit '5adeba4b7f63081257f9d0fb65127bdce0399c79' into eclair-plus-aosp
* commit '5adeba4b7f63081257f9d0fb65127bdce0399c79':
special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
Call nativeMotionUp from touchUpOnTextField to move the
mouse cursor to the text field if necessary before moving
the text caret to the desired position.
Fixes http://b/issue?id=2075647
* changes:
special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to round "out" these, to account for the slop in antialiasing, rather than using the existing routines that (correctly) round.
Merge commit 'e80534ff59b2e62a0ddf4359147b81f5ba10de86' into eclair-plus-aosp
* commit 'e80534ff59b2e62a0ddf4359147b81f5ba10de86':
Fix connection ID issue in Obex lib
Merge commit '2bccbcc777ca48a08663c16e90ea3f76ace6eb07' into eclair-plus-aosp
* commit '2bccbcc777ca48a08663c16e90ea3f76ace6eb07':
Fix issue 2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
Merge commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f' into eclair-plus-aosp
* commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f':
PowerManagerService: Use 5 cm threshold for the proximity sensor.
Merge commit '244f8c26365a303d9dd861bd48a29a4b48578da1' into eclair-plus-aosp
* commit '244f8c26365a303d9dd861bd48a29a4b48578da1':
Fix 2083478: Camera needs an auto-focus cancel API
The problem comes from the fact that when the duplicated output is closed after BT headset disconnection, the OUTPUT_CLOSED notification is not sent to AudioSystem. Then the mapping between notification stream and duplicated output cached in AudioSystem is not cleared and next time a notification is played, the duplicated output is selected and the createTrack() request is refused by AudioFlinger as the selected output doesn't exist.
The notification is ignored by AudioFlinger because when it is sent by the terminating playback thread, the thread has already been removed from the playback thread list.
The fix consists in sending the notification in closeOutput() and not when exiting the playback thread.
The same fix is applied to record threads.
Merge commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34' into eclair-plus-aosp
* commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34':
Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
This eliminates the assumption that the proximity sensor will always return
zero distance when it is active.
Change-Id: I6245b074e4c42aeae3a181e6a5087554517046d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Add changes to have the ability to turn on and off the
automatic light sensing for the device. This is fully configurable
and is by default not present. Vendors should override the ALS setting
to enable the automatic lighting controls.
These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.
If the user selects auto then the slide bar will become invisible. Manual mode
will present the slide bar to the user.
Change-Id: I146a6d75b99b08c9b839218ce6b85adf21f9fd73
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '678b4c20cb92ac2b86f13e52ea86d70301358680' into eclair-plus-aosp
* commit '678b4c20cb92ac2b86f13e52ea86d70301358680':
Various fixed for back key handling.
Merge commit '151921a62485f2141ad1316076c196ef00e1b421' into eclair-plus-aosp
* commit '151921a62485f2141ad1316076c196ef00e1b421':
add support for RGBX_8888 surfaces in SurfaceFlinger
Merge commit '294cd9856e30daa07efbdd7d925b3fad8cb123de' into eclair-plus-aosp
* commit '294cd9856e30daa07efbdd7d925b3fad8cb123de':
Last big work on #1991910: Make swipes work with capacitive keys
This takes care of allowing us to cancel the back button. The
back button is a bear because it is strewn all over the place --
everywhere you can close something, there is some code looking
for the back button that now needs to deal with being canceled.
The main things changed are activity (of course), dialog,
input method, search dialog. There are some other misc places
in the framework (and some I missed here that I will get in a
second pass).
To facility all of this, the key dispatching APIs now provide
a lot more support for dealing with looking for cancelled keys,
and incidentally also provide an actual API for catching long
key presses. This also helped clean up the code in PhoneWindow
where it deals with all of the combinations of key pressed and
releases. (And also allows people to override
Activity.onKeyLongPress() to provide a different long press
action for a standard key like search.)
And while I was doing this, I reworked how we detect long
presses by having this be part of the key event delivered by
the window manager. This should greatly reduce (hopefully
outright eliminate) the problems with long presses being
mis-detected when an application is being slow.
Change-Id: Ia19066b8d588d573df3eee6d96e1c90fdc19f57d
Merge commit '53793416d408366270d21f81734997db348bd918' into eclair-plus-aosp
* commit '53793416d408366270d21f81734997db348bd918':
Fix URI returned by IccProvider.
Merge commit '4503cb75a02f6465bd576366945a1c5f2c8c13f3' into eclair-plus-aosp
* commit '4503cb75a02f6465bd576366945a1c5f2c8c13f3':
Minor perf tweak for fountain.
Merge commit 'c2974809373697147cbe5754835cc871fb93aef1' into eclair-plus-aosp
* commit 'c2974809373697147cbe5754835cc871fb93aef1':
Fix issue #2116977: buttons are huge and bent
Merge commit 'e7f47f50ad0a97e32c87104e56f311db910e98f1' into eclair-plus-aosp
* commit 'e7f47f50ad0a97e32c87104e56f311db910e98f1':
add system properties for experimenting with sync timeouts.
Merge commit '74077c8f2ed67b79be67df853158932fbd774865' into eclair-plus-aosp
* commit '74077c8f2ed67b79be67df853158932fbd774865':
Clear the password field when reloading the current page.
Now that we are using preloaded drawables in compatibilty mode, when
constructing them from their constant state we need to set the new
drawable's target density appropriately.
Change-Id: I3665cbea09d38b9ac5f45f8c380dc8641f86b266
Merge commit 'b06aac86d1be8cd018f2568d64f50d61c421d1f0' into eclair-plus-aosp
* commit 'b06aac86d1be8cd018f2568d64f50d61c421d1f0':
fix [2117464] SF can crash when calling dumpsys
Merge commit 'a1212578bfd11bd391c686c82c18b21b4a3a69b4' into eclair-plus-aosp
* commit 'a1212578bfd11bd391c686c82c18b21b4a3a69b4':
make sure to update the tail pointer when undoing a dequeue
