summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-04-15 18:03:08 -0700
committerAdrian Roos <roosa@google.com>2015-04-16 01:49:25 +0000
commitf253eeb9d3d23d02746406b2b0e721ba3b4563ce (patch)
tree86ca600727ee6581bd9e075b46d43a721169653d /packages/SystemUI/src/com/android/systemui/keyguard
parentdc3e29c390b766388153496e1ba95faf0e55fced (diff)
downloadframeworks_base-f253eeb9d3d23d02746406b2b0e721ba3b4563ce.zip
frameworks_base-f253eeb9d3d23d02746406b2b0e721ba3b4563ce.tar.gz
frameworks_base-f253eeb9d3d23d02746406b2b0e721ba3b4563ce.tar.bz2
Fix lockscreen bugs with SHOW_WHEN_LOCKED
When unlocking to a SHOW_WHEN_LOCKED activity by clicking a notification, we don't get a the startKeyguardExitAnimation because Keyguard is not actually going away. Instead, we start it ourselves. Also fixes the bug where restarting Keyguard while it's occluded lead to an inconsistent state where the user got stuck on the lockscreen. Bug: 16481924 Change-Id: Iebc5bdd1287bbb81415ae01c7428850acc16c53f
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 065d62e..97a4c55 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -867,6 +867,12 @@ public class KeyguardViewMediator extends SystemUI {
*/
private void handleSetOccluded(boolean isOccluded) {
synchronized (KeyguardViewMediator.this) {
+ if (mHiding && isOccluded) {
+ // We're in the process of going away but WindowManager wants to show a
+ // SHOW_WHEN_LOCKED activity instead.
+ startKeyguardExitAnimation(0, 0);
+ }
+
if (mOccluded != isOccluded) {
mOccluded = isOccluded;
mStatusBarKeyguardViewManager.setOccluded(isOccluded);