Merge commit 'c2ee811d09126236ae41b2b3015ed60d508ac9ef'
* commit 'c2ee811d09126236ae41b2b3015ed60d508ac9ef':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'
* commit '21da33570278762d7e9375b83eb74130bf82728d':
First pass at replacing native plugin views with java.
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a'
* commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a':
Reconcile the character popups for the hard and soft keyboards.
Merge commit 'c52ae862ef18218f6db0c8b538d5cdf2685a07b1'
* commit 'c52ae862ef18218f6db0c8b538d5cdf2685a07b1':
Build the BitmapShader if it hasn't been built yet.
Merge commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950'
* commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950':
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758'
* commit 'bfb4992f190b1f93e70d2102f35f8df019406758':
Adding a system property to log slow queries
Merge commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085'
* commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
Merge commit '1198aa27f1c1952199dac8b59a14ab76a8fde607'
* commit '1198aa27f1c1952199dac8b59a14ab76a8fde607':
Added an API IOMX::createRendererFromJavaSurface.
Merge commit 'bd92532faaacb31ffbae6ecc159516e7c70ca068'
* commit 'bd92532faaacb31ffbae6ecc159516e7c70ca068':
Add more error message if the script failed to pull result file from device.
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 'dd4819f377509060bc441be9f04124e967acf0a3'
* commit 'dd4819f377509060bc441be9f04124e967acf0a3':
DockObserver wakes the display when broadcasting a change
Merge commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c'
* commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c':
Add SurfaceView API to put surface on top of window.
Merge commit 'fca752b9d8306c53afb4d362dbcd0921d16baec1'
* commit 'fca752b9d8306c53afb4d362dbcd0921d16baec1':
Assemble WAP datagram correctly when segments arrive out of order
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
Merge commit 'ae4df420055179a30a190a469f23faa9a3944d6e'
* commit 'ae4df420055179a30a190a469f23faa9a3944d6e':
Fix issue 2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
Merge commit '7472788a87f8cc758cd534d960d178a1481c4cfb'
* commit '7472788a87f8cc758cd534d960d178a1481c4cfb':
Text specifies "android:codeName" which doesnt exist, should be "android:versionName"
Merge commit '5cf8d00f0c1f511a769c171843dfd3427312b99a'
* commit '5cf8d00f0c1f511a769c171843dfd3427312b99a':
PowerManagerService: Use 5 cm threshold for the proximity sensor.
Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'
* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
Fix 2083478: Camera needs an auto-focus cancel API
Merge commit 'ce063a3510ed5764edda02ae1d22f4540b632e4e'
* commit 'ce063a3510ed5764edda02ae1d22f4540b632e4e':
Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
Merge commit '515a10c4b3022899a54b9c9f5ad1f46eb69c612a'
* commit '515a10c4b3022899a54b9c9f5ad1f46eb69c612a':
add support for RGBX_8888 surfaces in SurfaceFlinger
Merge commit 'a4160068beadf64db99f42ca327bfe263cc46a85'
* commit 'a4160068beadf64db99f42ca327bfe263cc46a85':
Last big work on #1991910: Make swipes work with capacitive keys
Merge commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59'
* commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59':
Fix issue #2116977: buttons are huge and bent
Merge commit '426ec7f30679c813350c18bdae125fce5b1c7725'
* commit '426ec7f30679c813350c18bdae125fce5b1c7725':
add system properties for experimenting with sync timeouts.
