Merge commit 'f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31' into eclair-plus-aosp
* commit 'f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31':
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
Added explicit TextView.setColor() to workaround bug with TextView.setSelected().
Merge commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1' into eclair-plus-aosp
* commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1':
Workaround for a keyguard problem that appeared in the in call screen.
Merge commit 'a3b4a8111c47852e212032008732e143636151e4' into eclair-plus-aosp
* commit 'a3b4a8111c47852e212032008732e143636151e4':
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
For bug 2352904, lockscreen need clearly show "Emergency Calls Only" status no matter with SIM status.
The change is to show both SIM card status and carrier PLMN including "Emergency Calls Only" status.
Merge commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501'
* commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501':
Do not turn off screen immediately after undocking.
While in call, pressing the power key to turn off the screen caused the Home button
to no longer work after rewaking the screen due to the KeyguardViewMediator mHidden flag not being set.
Change-Id: I322317671b2e5e32de23ed524f6e4808b0334c12
BUG: 2382766
Signed-off-by: Mike Lockwood <lockwood@android.com>
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent. Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.
Instead, we'll handle this separately in lockscreen.
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.
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 '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.
(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 '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-mr2
* commit '15ee33d4d475dc31709808a64120e56d555e992e':
Revert "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.
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>
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-mr2
* commit '760d266a4195db5f3f3dee94be9e0c020cf4051f':
Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
