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
This reverts commit f1b64f64ab.
It also updates RecognitionResult.java with changes made while it was in the voicesearch branch.
Change-Id: Ibffbe25397628a01ec49393a23c1825cef116501
Fix http://b/issue?id=2074446
Add in code that is normally called by TextView.onDraw(). Since
drawing does not happen for WebTextView, we need to call it
ourselves.
Change-Id: Icb47f6a58fba6f8b11e2924befc704f26af68d43
Merge commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79' into eclair-plus-aosp
* commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79':
slide the title if the site changes the scroll position
Slide the title away if the scroll is to zero or one, and the
title is partially or fully visible. Set the animation time
to at least SLIDE_TITLE_DURATION, currently set to 300 ms.
Merge commit '9092ab4d458ad60b459d5fad52368bde5d25f665' into eclair-plus-aosp
* commit '9092ab4d458ad60b459d5fad52368bde5d25f665':
Add support for launching activities when attaching to a car or desk dock.
Categories CATEGORY_CAR_DOCK and CATEGORY_DESK_DOCK can be assigned to
activities to make them launchable on docked events.
This is a better mechanism than listening for ACTION_DOCK_EVENT with a broadcast receiver.
Change-Id: Ic5f3ab3555ce02ca922bc31ebba41978cefe8bda
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '764916d01b779ccc8064946c6ba2962fe063ed86' into eclair-plus-aosp
* commit '764916d01b779ccc8064946c6ba2962fe063ed86':
Combine the "Permission Requested" title and subtitle into one string.
Merge commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8' into eclair-plus-aosp
* commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8':
Add new Gservices setting for discarding uphill ops for eclair and future devices.
Fix http://b/issue?id=2019857
If the user has not moved beyond the scaled touch slop, do not
turn it into a scroll, so the user can change the selection.
Change-Id: I1d88691a35ea2da4b03ad713b56331b5c268b757
Merge commit '0abc859e14fe557479cab490493e64ca6ab05e6e' into eclair-plus-aosp
* commit '0abc859e14fe557479cab490493e64ca6ab05e6e':
Show keyboard automatically in EditTextPreference dialogs
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
