Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp
* commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit 'd278ffc0984d730b333f53636a223eae6d9b7657' into eclair-mr2-plus-aosp
* commit 'd278ffc0984d730b333f53636a223eae6d9b7657':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit '96f225afad61ee701dd84348e380a40ff8900fc0' into eclair-mr2-plus-aosp
* commit '96f225afad61ee701dd84348e380a40ff8900fc0':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit '875d235cf1c685597026997bae49ea820351b576' into eclair-mr2-plus-aosp
* commit '875d235cf1c685597026997bae49ea820351b576':
doc change: edits to the screens support doc.
Merge commit '96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-mr2
* commit '96e0c3156e21bbdb0d94201b08d80379b98c472a':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747' into eclair-mr2
* commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit 'e12191a7ec9ab35e4ce80726be2734881a24a223' into eclair-mr2
* commit 'e12191a7ec9ab35e4ce80726be2734881a24a223':
doc change: edits to the screens support doc.
Fixes bug b/2158297 (lock screen should time out after 7 seconds)
Change-Id: Ia3f7ef6464129ab78283923dbfd7f7472136e676
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'd9ec29f64827bc703a23b1c33d653906a91713fc' into eclair-mr2-plus-aosp
* commit 'd9ec29f64827bc703a23b1c33d653906a91713fc':
fix text area insertion order, partially
While Leon mulls over how to rewrite WebTextView to
handle webkit driven focus changes, these fixes make
the current code slightly more stable.
Keep track of when keyDown is sent again so that the
WebTextView won't be rebuilt in that case.
Don't clear the cursor from WebTextView if the there's
no native focus pointer.
Only set the selection to its initial state once when
passing events down to webkit.
partially fixes http://b/issue?id=2201049
Merge commit 'f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765' into eclair-mr2-plus-aosp
* commit 'f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765':
Send "encoding problem" to the network for general errors during SMS dispatch.
Merge commit 'ee58d1bf9c54eaed623c4419e1d9db269a9c4137' into eclair
* commit 'ee58d1bf9c54eaed623c4419e1d9db269a9c4137':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit '439bf97ca5adb3e33eaf15faf25034b012a7d9d0' into eclair
* commit '439bf97ca5adb3e33eaf15faf25034b012a7d9d0':
doc change: edits to the screens support doc.
Merge commit 'f14da417f3cb1f80a62732238623bb83173255c0' into eclair-mr2
* commit 'f14da417f3cb1f80a62732238623bb83173255c0':
Send "encoding problem" to the network for general errors during SMS dispatch.
Merge commit 'f8a57dcb5983ad465bff697bbccb0eca031e7072' into eclair-mr2-plus-aosp
* commit 'f8a57dcb5983ad465bff697bbccb0eca031e7072':
PowerManagerService: Ignore user activity while the screen is animating off.
Merge commit '9f9f56212610ddd69c8af8ddeeed39265c0e58e1' into eclair-mr2-plus-aosp
* commit '9f9f56212610ddd69c8af8ddeeed39265c0e58e1':
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Merge commit '585449b084ebeaaad4b9d2bc1912490e952c5a01' into eclair-mr2-plus-aosp
* commit '585449b084ebeaaad4b9d2bc1912490e952c5a01':
Make FWK start a wifi scan if supplicant forgets. (do not merge)
Merge commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b' into eclair-mr2-plus-aosp
* commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9' into eclair-mr2
* commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9':
PowerManagerService: Ignore user activity while the screen is animating off.
Merge commit '0737b1643071694cf8767e3609ad628f1679d63a' into eclair-mr2
* commit '0737b1643071694cf8767e3609ad628f1679d63a':
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Merge commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768' into eclair-mr2
* commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768':
Make FWK start a wifi scan if supplicant forgets. (do not merge)
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2
* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit '1de953aee53db0d3040cf242b20e9340787725c5' into eclair-mr2-plus-aosp
* commit '1de953aee53db0d3040cf242b20e9340787725c5':
fix the "right icon" in the titlebar
Merge commit '70de03d41374aa3f4d3308d5d44e1db908d22667' into eclair-mr2-plus-aosp
* commit '70de03d41374aa3f4d3308d5d44e1db908d22667':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '70271e3bbda03225a64ff70c833d97829fc0ac1c' into eclair-mr2-plus-aosp
* commit '70271e3bbda03225a64ff70c833d97829fc0ac1c':
Import revised translations. DO NOT MERGE
Merge commit '10a1600673c6a7c3b02c3996ba6b46ef884563ad' into eclair-mr2-plus-aosp
* commit '10a1600673c6a7c3b02c3996ba6b46ef884563ad':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '1a34dd69ad0132b13b99813bb1d4f37dac6ca611' into eclair-mr2-plus-aosp
* commit '1a34dd69ad0132b13b99813bb1d4f37dac6ca611':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-mr2
* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2
* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
Import revised translations. DO NOT MERGE
Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp
* commit '6d924c69af055559ed84afaf487aa38bd6fd2e33':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-mr2
* commit '785768a9216b3a631237587feffea2aeb05a91cc':
Prevent transparent region from getting out of sync with Surface Flinger
