diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 01609e47aa40..4c7f9915ca45 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -264,10 +264,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } } mOccluded = occluded; - mPhoneStatusBar.updateMediaMetaData(false, animate && !occluded); + if (mShowing) { + mPhoneStatusBar.updateMediaMetaData(false, animate && !occluded); + } mStatusBarWindowManager.setKeyguardOccluded(occluded); reset(); - if (animate && !occluded) { + if (animate && !occluded && mShowing) { mPhoneStatusBar.animateKeyguardUnoccluding(); } } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 2f25971f0f0a..b609d614f64f 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5481,6 +5481,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { mStatusBar.getAttrs().privateFlags &= ~PRIVATE_FLAG_KEYGUARD; mStatusBar.getAttrs().flags &= ~FLAG_SHOW_WALLPAPER; return true; + } else if (wasOccluded != isOccluded) { + mKeyguardOccluded = isOccluded; + mKeyguardDelegate.setOccluded(isOccluded, false /* animate */); + return false; } else { return false; } |