Merge commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5'
* commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c'
* commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c':
Add SurfaceView API to put surface on top of window.
Merge commit '6cd80d738969e9398f763691bde4e240bff48074'
* commit '6cd80d738969e9398f763691bde4e240bff48074':
if the cursor and focus don't match, match them on text view clicks
Merge commit 'c6a35f8e3f6823f095259ee5ffd595d123c0cc1b'
* commit 'c6a35f8e3f6823f095259ee5ffd595d123c0cc1b':
compute Y scroll max by scaling only, ignoring title bar height
Merge commit '1f42641ebf775d0438f2694876067e547a40527a'
* commit '1f42641ebf775d0438f2694876067e547a40527a':
special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'
* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
Fix 2083478: Camera needs an auto-focus cancel API
Merge commit 'a4160068beadf64db99f42ca327bfe263cc46a85'
* commit 'a4160068beadf64db99f42ca327bfe263cc46a85':
Last big work on #1991910: Make swipes work with capacitive keys
Merge commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59'
* commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59':
Fix issue #2116977: buttons are huge and bent
Merge commit '426ec7f30679c813350c18bdae125fce5b1c7725'
* commit '426ec7f30679c813350c18bdae125fce5b1c7725':
add system properties for experimenting with sync timeouts.
Merge commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b'
* commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b':
Clear the password field when reloading the current page.
Merge commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa'
* commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa':
Bring up the soft keyboard when touching a focused textfield.
Merge commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01'
* commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01':
Remove trackball double click. Treat each click as a single click.
Merge commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8'
* commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8':
Set the minimum fling to the title height.
Merge commit '76d82371a90e81f2d5214d7b16ba713cb73771d1'
* commit '76d82371a90e81f2d5214d7b16ba713cb73771d1':
Add "rtsp" to the list of URL schemes that get linkified.
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'
* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
Merge commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989'
* commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989':
Use floor to calculate the range to avoid the rounding error triggered
Merge commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda'
* commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda':
Tell GlobalSearch about searches without a suggestion
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit '6d9eebe7320637f0256c077ba5ed6724b5a4ab0d' into eclair-plus-aosp
* commit '6d9eebe7320637f0256c077ba5ed6724b5a4ab0d':
Move backlight brightness from HardwareService to PowerManager
Merge commit '0ae011b6f6d709d840f60f25df2046c9545a10a2' into eclair-plus-aosp
* commit '0ae011b6f6d709d840f60f25df2046c9545a10a2':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'
* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'
* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Merge commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643'
* commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'
* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
Various cleanup around resources and nine-patches.
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2' into eclair-plus-aosp
* commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2':
Add SurfaceView API to put surface on top of window.
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
