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
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-mr2
* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp
* commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit '1e23a4019a2782054fc2c72f243008e29e13b411' into eclair-mr2-plus-aosp
* commit '1e23a4019a2782054fc2c72f243008e29e13b411':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Fixes bug b/2202165 (Often I when pressing power to turn off I get the lock screen)
Change-Id: I53f8350203d57fbb5f143edc44985879caadd78f
Signed-off-by: Mike Lockwood <lockwood@android.com>
* changes:
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher. - Ensure system IMEs are put on the enabled list at startup/install. - If the default IME is not installed, choose another one whenever building input method list.
