Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp
* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Merge commit 'dfe095a045f132dd9c75da4286b87532d9a973a0' into eclair-plus-aosp
* commit 'dfe095a045f132dd9c75da4286b87532d9a973a0':
Don't change the zoom filter during the zoom animation.
Call another invalidate() to draw with the final filters.
This fixed the problem where the end of the zoom animation
is slow and jagged.
Fix http://b/issue?id=2126523
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp
* commit '2f77ffb087892f9474b35cb019f593025653e492':
Don't crash if the cursor is null.
Merge commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823' into eclair-plus-aosp
* commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823':
Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
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
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
This reverts commit f1b64f64ab088a3e8cd32ec31f61c958c61d19e5.
It also updates RecognitionResult.java with changes made while it was in the voicesearch branch.
Change-Id: Ibffbe25397628a01ec49393a23c1825cef116501
