Merge commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f' into gingerbread-plus-aosp
* commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f':
Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp
* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
Support for RTP packets arriving interleaved with RTSP responses.
Merge commit 'ed101933ab7506d841d6eaa7bebda4b674c38088' into gingerbread-plus-aosp
* commit 'ed101933ab7506d841d6eaa7bebda4b674c38088':
DO NOT MERGE -- copy on tapping outside of selected text in gmail
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp
* commit '00d1772d8cfb94066b757034055ac38897d161da':
Continue trying to make the turn off quickly after call feature work.
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread
* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
Continue trying to make the turn off quickly after call feature work.
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp
* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
Just disable widgets that come from apps on sd cards, because they don't work anyway.
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp
* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
Fix typo that makes apps on sd work better with app widgets.
Text can be selected in gmail by choosing Select Text from the
menu and dragging the selection. There's no pretend action bar
like there is in the Browser to commit the selection.
When tapping outside of the selection, copy the text, if
the client (like gmail) has mapped the trackball to the
arrow keys.
Change-Id: I7dd133fd860d392bb01ec103e379e1f1d2a43e64
http://b/2626451
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp
* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
Fix for IndexOutOfBounds in TextView getWordLimitsAt.
The previous implementation worked if the set timeout is short enough, which mine was. This one
carries the remaining amount of timeout override forward through all of the countdown steps.
Bug: 2844990
Change-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp
* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
Changed type of reverb presets from int to short
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp
* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
Fix for NPE in TextView.
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp
* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
add mouse up/down/click support in DumpRenderTree
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.
Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp
* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
Make sure that timestamp does not go backward in MP4 file writer
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.
Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp
* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '0858806ffcb9ff34725abb79106aa1de27d1bf60' into gingerbread-plus-aosp
* commit '0858806ffcb9ff34725abb79106aa1de27d1bf60':
Add Wifi High Perf. mode during a call.
To prevent the wifi from entering low-power mode due to the screen off
triggered by the proximity sensor.
Change-Id: I490bc594d800bc30c256e52ef3bce08bf86bc7b1
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp
* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
Don't retain global ref to last inflated context.
Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp
* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
Add dynamic uid info for tracking the sip service usage.
