Merge commit 'db9932c235afa0895fef80584b4813befe79d5c3'
* commit 'db9932c235afa0895fef80584b4813befe79d5c3':
Fix the bogus crashes in layout and reliability tests (the device actually went offline).
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 '474443fac4926c46a09cec9f50024bf9ebe72c94'
* commit '474443fac4926c46a09cec9f50024bf9ebe72c94':
Fix the parsing for instrumentation result, some Java exceptions are not reported right now
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'
* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
Merge commit '5962166750355c36efb9f209fcff33edf837186c'
* commit '5962166750355c36efb9f209fcff33edf837186c':
Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
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 '6fc35e3e7e6c61f2f7f5176d6979ae860f471e83'
* commit '6fc35e3e7e6c61f2f7f5176d6979ae860f471e83':
Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
Merge commit 'b615166ce7ac554a0278a8bc364f301316e0c745' into eclair-plus-aosp
* commit 'b615166ce7ac554a0278a8bc364f301316e0c745':
Added a field to track if the call is to a voicemail instance.
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 'a5526468a38289cc17b231c0d0eca918e34ede49' into eclair-plus-aosp
* commit 'a5526468a38289cc17b231c0d0eca918e34ede49':
Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
* changes:
Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
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.
Merge commit '0abc859e14fe557479cab490493e64ca6ab05e6e' into eclair-plus-aosp
* commit '0abc859e14fe557479cab490493e64ca6ab05e6e':
Show keyboard automatically in EditTextPreference dialogs
Refactored common code between CallerInfo and CallerInfoAsyncQuery that deal
with voicemail number comparison.
In CallerInfo.java added a new field mIsVoiceMail to indicate this is a
voicemail call.
Added a new method to convert the CallerInfo into a VM instance.
Added a new method to generate a debug string from an instance.
PhoneNumberUtils has a new method "isVoiceMailNumber" to check if a number
is a VM one. I left the method as hidden. Previously any security exception
failure was cached in a static variable. I removed that and
privilege the optmistic scenario. I am not sure if the security exception
is only for the 'regular' telephony layer and if it applies if a 3rd party
VM app is installed (e.g googlevoice), hence i removed the cashing to make
sure we can pick up new voicemail providers when installed/enabled/disabled.
Bug:2112640
Merge commit '2fa86ffcba23137bb296972b98a119723e133000'
* commit '2fa86ffcba23137bb296972b98a119723e133000':
Pass return code from Camera HAL for setParameters().
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority