Merge commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b' into eclair-plus-aosp
* commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b':
Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Instead add ACTION_REQUEST_DISCOVERABLE for the system to show a dialog to
adjust discoverable mode.
Also remove createBond(), removeBond() and cancelBondProcess(). The Settings
App already handles these automatically when connections require bonding.
Change-Id: I216154cd1b6de410de64ba91b07d7263ac03e8df
Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp
* commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99':
Add "TYPE=" to type attribute when appropriate.
Merge commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb' into eclair-plus-aosp
* commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb':
Make removeOnAccountsUpdateListener cope with null handlers.
Merge commit '531e580ab160864e4152f431eaeb965676c58d19' into eclair-plus-aosp
* commit '531e580ab160864e4152f431eaeb965676c58d19':
remove the incorrectly located nickname
Merge commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e' into eclair-plus-aosp
* commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e':
Not all WebView's host have permission to read the history.
Merge commit 'f18c539344655c8d39e3412a0985f7e42193eb52' into eclair-plus-aosp
* commit 'f18c539344655c8d39e3412a0985f7e42193eb52':
set the selection after sending a click
Webkit expects the currently focused text input to have
a set selection before it can receive key events for insertion.
Coincidentally, we always set the selection except when
using the 'next' button on the IME to switch between text fields.
The selection has to be set after the text field receives
focus, so add a setSelection() message after the click() message
is sent in passToJavaScript().
fixes http://b/issue?id=2087546
Merge commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8' into eclair-plus-aosp
* commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8':
Add final to appropriate variables.
Merge commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa' into eclair-plus-aosp
* commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa':
ResultTransport needs a default value. If the thread is
* changes:
ResultTransport needs a default value. If the thread is ununlocked by something else other than CallbackProxy's notify(), it can have a null value.
Merge commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7' into eclair-plus-aosp
* commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7':
Add call log support to pim.vcard.VCardComposer
Merge commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215' into eclair-plus-aosp
* commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215':
Restrict touch to the view height with the title. This
* changes:
Restrict touch to the view height with the title. This should fix the links in the bottom of the screen are not touchable when title bar presents.
should fix the links in the bottom of the screen are not
touchable when title bar presents.
Also fix a bug in calcOutContentVisibleRect. We need to
adjust visibleTitleHeight for the top, but we should not
do it for the bottom. Otherwise, WebKit will have the
wrong visible rect and it will think the part right under
the bottom of the screen are visible.
Fix http://b/issue?id=2140971
Merge commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49' into eclair-plus-aosp
* commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49':
Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
Merge commit '13ab701e0ab315d75edc03876bf3dc959e6f478c' into eclair-plus-aosp
* commit '13ab701e0ab315d75edc03876bf3dc959e6f478c':
Make the new ContactsContract APIs public.
Merge commit 'a7beb95ede9700b1f206ffa571c205c9b7e68539' into eclair-plus-aosp
* commit 'a7beb95ede9700b1f206ffa571c205c9b7e68539':
Add possibility to customize the chooser dialog used to allow the user to choose the application for sharing a link.
Previously, if callers registered OnAccountsUpdateListeners with a null handler,
removeOnAccountsUpdateListener would fail attempting to remove the listener.
Change-Id: If9906d3711f816e60c4b491b7f33671f089ac00f
Merge commit 'd421995fdb490c687d27b56aa89bc83afc7c3d06' into eclair-plus-aosp
* commit 'd421995fdb490c687d27b56aa89bc83afc7c3d06':
Fix parsing of HTTP Date years.
Merge commit '23703f16f816d4212e5a95c101a851660c095f24' into eclair-plus-aosp
* commit '23703f16f816d4212e5a95c101a851660c095f24':
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
