From 2986c1567e0d0fc010af470d01dd1f11d93d2836 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Mon, 9 Apr 2018 20:49:41 -0700 Subject: [PATCH] Bouncer animation and message - Do not run security container animation if the device was unlocked - Do not erase message field after swiping up Test: go/sysui-bouncer-tests Change-Id: I7e0ccca0877e0cd29f7b2b65e8bff11f279c4b39 Fixes: 77810996 Bug: 76453411 --- .../src/com/android/keyguard/KeyguardAbsKeyInputView.java | 2 +- .../com/android/systemui/keyguard/KeyguardViewMediator.java | 4 ++++ .../src/com/android/systemui/statusbar/phone/StatusBar.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java index d63ad0840734c..00cd5a7b1689b 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -265,11 +265,11 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 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 d6e59c77af9ce..426f71409095b 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 @@ public class KeyguardViewMediator extends SystemUI { 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 0072dc07d5353..c1e153ae019e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -3940,7 +3940,8 @@ public class StatusBar extends SystemUI implements DemoMode, } private void showBouncerIfKeyguard() { - if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { + if ((mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) + && !mKeyguardViewMediator.isHiding()) { showBouncer(true /* animated */); } }