Merge commit 'e459aa64515f91b494843d2eb2852be2da3d1628'
* commit 'e459aa64515f91b494843d2eb2852be2da3d1628':
Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f' into eclair-mr2-plus-aosp
* commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f':
Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0' into eclair-mr2-plus-aosp
* commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0':
Cleanup how a plugin goes full-screen.
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
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.
Merge commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0'
* commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0':
Refactoring plugins to use new java interfaces.
Merge commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd' into eclair-mr2-plus-aosp
* commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd':
Refactoring plugins to use new java interfaces.
This change adds 3 new interfaces for plugins to the framework. This
change also includes extensive cleanup as we consolidate internal plugin
functions into the pluginManager. Also using the new interfaces we no
longer need to pass additional parameters in quite a few methods.
Merge commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9'
* commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9':
Store info in the bookmarks/history database on whether it was a manually entered url.
Merge commit '331c7788a84fc6f625ac1bafbb33cf7da1116407' into eclair-mr2-plus-aosp
* commit '331c7788a84fc6f625ac1bafbb33cf7da1116407':
Store info in the bookmarks/history database on whether it was a manually entered url.
Before, if you passed an android.resource URI, e.g.
"android.resource://com.android.browser/2130837550"
to ImageView.setImageURI(), it failed with:
I/System.out( 1730): resolveUri failed on bad bitmap uri: android.resource://com.android.browser/2130837550
This change allows android.resource: and file: URIs in addition to the
existing support for content: URIs.
Fixes: http://b/issue?id=2289441
Change-Id: I98819b183c29eb60a70708d373d2199cdc0ea017
Merge commit '78b0e0b8feab377e44ff01471fa9ca8e1516fb65'
* commit '78b0e0b8feab377e44ff01471fa9ca8e1516fb65':
Add a new priority for Auto Connection of A2DP.
Merge commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3' into eclair-mr2-plus-aosp
* commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3':
Add a new priority for Auto Connection of A2DP.
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'
* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
Change the DropBoxManager API slightly (this is public, but not yet released) --
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp
* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
Change the DropBoxManager API slightly (this is public, but not yet released) --
* changes:
Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610'
* commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610':
Add setAttentionLight() to IPowerManager for the Phone app.
Merge commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp
* commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b':
Add setAttentionLight() to IPowerManager for the Phone app.
take a File instead of a ParcelFileDescriptor (gets opened internally) --
that way the caller doesn't have to worry about closing their PFD and so on.
(Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp
* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
Remove HardwareService and move vibrator support to VibratorService.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.
Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '0e1fcb16940fe7a219ee75012b3f010432ed699f'
* commit '0e1fcb16940fe7a219ee75012b3f010432ed699f':
When clicking on a WebTextView, always call nativeMotionUp.
Merge commit 'f90b1261a53bc0bfc772337551eb4c540022cd22' into eclair-mr2-plus-aosp
* commit 'f90b1261a53bc0bfc772337551eb4c540022cd22':
When clicking on a WebTextView, always call nativeMotionUp.
We were previously calling nativeTextInputMotionUp, which was
intended to be faster than nativeMotionUp, which does more work.
However, as discussed in http://b/issue?id=2257787 , I think we
should simply call nativeMotionUp, which does everything the old
method did, while also correcting things if necessary. This fixes
the second problem listed in http://b/issue?id=2266756 , since
nativeMotionUp will recognize that the <select> element should
take the click.
Since I have removed a native method, this requires a change to
external/webkit.
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.
