| commit | 272d0617a96d4ef760f85a6191ae24310102394f | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Tue Apr 10 14:11:57 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 10 14:11:57 2018 -0700 |
| tree | 7ddb1a7b9c12f8b1cbaf59a54f0b1cf8d01337f8 | |
| parent | c623c257221b60de86d9ca224d5b6567d8e72ad1 [diff] | |
| parent | 7df2c87f0c46d27ad613de8658706b9998eb2c98 [diff] |
Merge "Bouncer animation and message" into pi-dev am: be72f3d5b8 am: 7df2c87f0c Change-Id: I437371b4d53bda1b078de6f76bf33a98bce37352
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java index d63ad08..00cd5a7 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
@@ -265,11 +265,11 @@ mPendingLockCheck.cancel(false); mPendingLockCheck = null; } + reset(); } @Override public void onResume(int reason) { - reset(); } @Override
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index d6e59c7..426f714 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1184,6 +1184,10 @@ Trace.endSection(); } + public boolean isHiding() { + return mHiding; + } + /** * Handles SET_OCCLUDED message sent by setOccluded() */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index ab13678..4b2bc45 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -3942,7 +3942,8 @@ } private void showBouncerIfKeyguard() { - if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { + if ((mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) + && !mKeyguardViewMediator.isHiding()) { showBouncer(true /* animated */); } }