| commit | 7df2c87f0c46d27ad613de8658706b9998eb2c98 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Tue Apr 10 14:00:38 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 10 14:00:38 2018 -0700 |
| tree | f598aa01a4055a409b89358236021dc31aa19115 | |
| parent | e310042df264e2a65ca35beeb9371dc9d1c3531f [diff] | |
| parent | be72f3d5b88db1e109b9faa0504aacda91c318ac [diff] |
Merge "Bouncer animation and message" into pi-dev am: be72f3d5b8 Change-Id: Ib2244c7f448e7dafe0f6f87958e8677949de808f
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 */); } }