Merge commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f' into eclair-mr2-plus-aosp
* commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f':
Do not hide the cursor ring when clicking on an input field.
While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
Fixes my previous fix for bug b/2201585 (Pressing power button when phone ringing should mute ringer)
Change-Id: I9460e21245b9719f715818f7ad878b121857d773
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-mr2
* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-plus-aosp
* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
When pressing the trackball on a text input field, do not call
setFollowedLink, which results in the cursor ring disappearing and
the WebTextView being torn down. Fixes http://b/issue?id=2210127
Merge commit '5c73c3bce410aa84bc0c57eee5b394c044035e33'
* commit '5c73c3bce410aa84bc0c57eee5b394c044035e33':
Make the VideoView go away automatically at the end of playback.
Merge commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9' into eclair-mr2-plus-aosp
* commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9':
Make the VideoView go away automatically at the end of playback.
- when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
- update unit test.
Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp
* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-plus-aosp
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '146ef723bc0fc87aba00400196a5e64ab128ee17' into eclair-mr2
* commit '146ef723bc0fc87aba00400196a5e64ab128ee17':
When phone is ringing, power button should hang up phone in addition to turning off the screen.
Merge commit '52ab52f35b9b6be78b818f377608c18d97f137ce'
* commit '52ab52f35b9b6be78b818f377608c18d97f137ce':
Update the names of the widgets when the locale changes.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'
* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '36cf8123d8cf9047c64633a963706f40cecc0bb1'
* commit '36cf8123d8cf9047c64633a963706f40cecc0bb1':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58' into eclair-mr2-plus-aosp
* commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58':
Update the names of the widgets when the locale changes.
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-mr2
* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-plus-aosp
* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
