Merge commit 'beae79dfcac8ba09069a80b4f129feb8b585b480'
* commit 'beae79dfcac8ba09069a80b4f129feb8b585b480':
Move emergency call button to top-right when no SIM.
Merge commit '97467c6fd99f67bb0a7024533ea8cc1626c41ac8' into eclair-mr2-plus-aosp
* commit '97467c6fd99f67bb0a7024533ea8cc1626c41ac8':
Move emergency call button to top-right when no SIM.
Also allows lockscreen's toasts to restore the previous text
in the status TextView, which is necessary for this UI. Also
added color to the toasts (another UI ask).
In conjunction with change Ifea65fb9.
http://b/2260798
Merge commit '2d7f59319ad81139b826dff79e97cf7263832014'
* commit '2d7f59319ad81139b826dff79e97cf7263832014':
Fix issue #2302336: System dialogs are not being given a layer
Merge commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84'
* commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84':
Do not show keyguard if screen is turned off by proximity sensor.
Merge commit '3e5eceb93ccdb00296e96154cbc0491a5516538b' into eclair-mr2-plus-aosp
* commit '3e5eceb93ccdb00296e96154cbc0491a5516538b':
Fix issue #2302336: System dialogs are not being given a layer
Merge commit '57932798cf11d72e656fd6e315b83e2c571cd129' into eclair-mr2-plus-aosp
* commit '57932798cf11d72e656fd6e315b83e2c571cd129':
Do not show keyguard if screen is turned off by proximity sensor.
Merge commit '4dbf514c6c73832630e4c9bb068cf950ff044a34' into eclair-plus-aosp
* commit '4dbf514c6c73832630e4c9bb068cf950ff044a34':
Fix issue #2302336: System dialogs are not being given a layer
Merge commit '4dbf514c6c73832630e4c9bb068cf950ff044a34' into eclair-mr2
* commit '4dbf514c6c73832630e4c9bb068cf950ff044a34':
Fix issue #2302336: System dialogs are not being given a layer
Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-mr2
* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
Do not show keyguard if screen is turned off by proximity sensor.
Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-plus-aosp
* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
Do not show keyguard if screen is turned off by proximity sensor.
(We were trying to place the emergency call button beneath a
layout object that no longer exists, which is why it was
showing up at the top of the screen on top of other things.)
Change-Id: I10b8b90f0e5923edf5d672b822ee8da6e28933d2
Fixes bug b/2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I85572973c142a72b3bba0bb032e5d2f710b5e36c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '81c950884faa981214ce7635afe9a65eae468697'
* commit '81c950884faa981214ce7635afe9a65eae468697':
Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit '6f277195b9434c516facd33f684223a7639de0c5' into eclair-mr2-plus-aosp
* commit '6f277195b9434c516facd33f684223a7639de0c5':
Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-mr2
* commit '15ee33d4d475dc31709808a64120e56d555e992e':
Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-plus-aosp
* commit '15ee33d4d475dc31709808a64120e56d555e992e':
Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '70d1fe383e3f023e71889345ffd9b2fa921495b4' into eclair-mr2-plus-aosp
* commit '70d1fe383e3f023e71889345ffd9b2fa921495b4':
Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit 'a492c9b07dc623c6c7beba7f9a90866053bf24f9' into eclair-mr2-plus-aosp
* commit 'a492c9b07dc623c6c7beba7f9a90866053bf24f9':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Merge commit 'e7ef42416088235d9e220e3b031d4f612f436a06' into eclair-mr2
* commit 'e7ef42416088235d9e220e3b031d4f612f436a06':
Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c' into eclair-mr2
* commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Merge commit 'e7ef42416088235d9e220e3b031d4f612f436a06' into eclair-plus-aosp
* commit 'e7ef42416088235d9e220e3b031d4f612f436a06':
Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c' into eclair-plus-aosp
* commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Fixes bug b/2297262 (Volume keys on passion don't work while in-call and phone is pressed to my ear)
Change-Id: I775daa24295482000f87273d1f84dd796fb0f4eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes b/2297221 ('Add call' button has no action, if call is answered on lockpattern screen)
Change-Id: I6df8f64dedc4d2d8b02f746213c7b1b336d6560e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '6cc42b70c592d5a112809a0230764819de3c7c12'
* commit '6cc42b70c592d5a112809a0230764819de3c7c12':
Fix bug 2290852: Screen wakes up in my pocket while listening to music
Merge commit '90bca75513297c2e851638f06ecc821ce75fcbe5' into eclair-mr2-plus-aosp
* commit '90bca75513297c2e851638f06ecc821ce75fcbe5':
Fix bug 2290852: Screen wakes up in my pocket while listening to music
Merge commit '99fb493fdfd076d08d13505e805429bdc1134ebc'
* commit '99fb493fdfd076d08d13505e805429bdc1134ebc':
Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
Merge commit 'b64c72dfb3e635093b00690454cb905ffff68ab9' into eclair-plus-aosp
* commit 'b64c72dfb3e635093b00690454cb905ffff68ab9':
Fix bug 2290852: Screen wakes up in my pocket while listening to music
Merge commit '5736e96001e3c2575117505a8b8891577b61c782' into eclair-mr2-plus-aosp
* commit '5736e96001e3c2575117505a8b8891577b61c782':
Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
When the screen is off keyguard is open but hidden by another activity
make sure that non-waking events like volume key or track ball press
do not turn the screen back on.
Change-Id: Ie6b191360b903b54388a6f65680ccc3264a51dd8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '760d266a4195db5f3f3dee94be9e0c020cf4051f' into eclair-plus-aosp
* commit '760d266a4195db5f3f3dee94be9e0c020cf4051f':
Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
Merge commit 'd67adbcd7c60d85280bb74f3ded48bc12d8417a8'
* commit 'd67adbcd7c60d85280bb74f3ded48bc12d8417a8':
Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
