Merge commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501'
* commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501':
Do not turn off screen immediately after undocking.
Merge commit '5b2151ae8654f63bd25e05e87f872ec6f78f0519' into eclair-plus-aosp
* commit '5b2151ae8654f63bd25e05e87f872ec6f78f0519':
Do not turn off screen immediately after undocking.
Adding a SAML account to the system would cause the current test to fail because it expected to have
only one account on the system. Instead, ensure that the device has at lease one non-SAML account.
Fixed update bug where having a single SAML account still showed the "Forgot pattern" button.
Tested:
- Wipe device and add pattern lock
- Add SAML account, verify "forgot pattern" doesn't appear.
- Add GAIA account, verify "forgot pattern" appears.
- Wipe device and add pattern lock
- Add GAIA account, verify "forgot pattern" appears
- Add SAML account, verify "forgot pattern" doesn't go away.
Merge commit 'b728c072e98ee560dc97744c85d914bd550a8a43'
* commit 'b728c072e98ee560dc97744c85d914bd550a8a43':
Add replace flag to a few more broadcasts.
Merge commit 'ab4b6c42d78b3d8230d8b444e301f2691884980e' into eclair-mr2-plus-aosp
* commit 'ab4b6c42d78b3d8230d8b444e301f2691884980e':
Add replace flag to a few more broadcasts.
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."
