Merge commit '055714ddbb0db6634e362b357f5e11a77444c6de'
* commit '055714ddbb0db6634e362b357f5e11a77444c6de':
Make vCard importer code use Account information if possible.
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'
* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'
* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'
* commit '21da33570278762d7e9375b83eb74130bf82728d':
First pass at replacing native plugin views with java.
Merge commit '074c11c1649a097ba1beae719069f8d4a2dd43e3' into eclair-plus-aosp
* commit '074c11c1649a097ba1beae719069f8d4a2dd43e3':
Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp
* commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296':
Add a null checking to avoid crash.
Merge commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3' into eclair-plus-aosp
* commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3':
do not merge. Revert "do not merge. Remove voicesearch-specific functionality from framework."
Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp
* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
Make ACTV use all available space if height is FILL_PARENT.
Merge commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0' into eclair-plus-aosp
* commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0':
Poster support on the Java side
Merge commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c' into eclair-plus-aosp
* commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c':
Handle BACK key with focus in search ACTV correctly
Merge commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6' into eclair-plus-aosp
* commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6':
remove the signin required notification as when the signin is successful
Merge commit '81521abea121683643cedbb7483a9a7eb0e466ae' into eclair-plus-aosp
* commit '81521abea121683643cedbb7483a9a7eb0e466ae':
Add "MMS" to common phone number types.
Merge commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a' into eclair-plus-aosp
* commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a':
Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp
* commit '972f0e3806f379b7fb6e43265f56ddd91c38107e':
Add a parcelable version of UUID file.
Merge commit '0828beee503b99a8f38f456416592d4ed6c799ae' into eclair-plus-aosp
* commit '0828beee503b99a8f38f456416592d4ed6c799ae':
Add one more hardware keyboard character popup: \ if you hold /
Merge commit '38456260b919497bf948c1e3fd5a7b76b5dda68a' into eclair-plus-aosp
* commit '38456260b919497bf948c1e3fd5a7b76b5dda68a':
Update the input method when the selection changes.
Merge commit '5f78786cf9802b988a4de3c08555eb43f1e02e04' into eclair-plus-aosp
* commit '5f78786cf9802b988a4de3c08555eb43f1e02e04':
add the ability to do a newAssert with no values
Merge commit '32c687c20d6ac3080b396787147892dc85126b33' into eclair-plus-aosp
* commit '32c687c20d6ac3080b396787147892dc85126b33':
Change Theme.Light's background back to pure white.
Merge commit '4295613a0ea1f61398d3123746740ca27d9ea170' into eclair-plus-aosp
* commit '4295613a0ea1f61398d3123746740ca27d9ea170':
Allow touches to change the selection in WebTextView.
Merge commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60' into eclair-plus-aosp
* commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60':
Fix a handful of bugs in the ContactHeaderWidget
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a'
* commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a':
Reconcile the character popups for the hard and soft keyboards.
Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758'
* commit 'bfb4992f190b1f93e70d2102f35f8df019406758':
Adding a system property to log slow queries
Merge commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047'
* commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047':
Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
Merge commit 'a451c6255962116516c3b4df92fd72084a881e0e'
* commit 'a451c6255962116516c3b4df92fd72084a881e0e':
redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
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
This prevents the drop down from resizing when the keyboard is shown / hidden, and thus fixes the issue where the 4th item in the list could not be selected when in landscape mode.
Bug: 2096394
Change-Id: Id0e687c897a724379073dcfa82de7ce89ae12035
Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'
* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
Fix 2083478: Camera needs an auto-focus cancel API
