From d7344dcd6c2df6a95b80d23fb87ae63867211945 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Fri, 20 Apr 2018 12:08:52 +0800 Subject: [PATCH] Fix wrong bouncer translation during hint animation It's not correct to assume that the bouncer translation is 0 when the unlock hint animation is running. The correct translation is 1 since the view is completely hidden. FalsingManager was receiving the wrong bouncer state, and this caused the rejection swipe gestures. Change-Id: I7c48a326f054a2c09809e5a1096ca42907472eac Fixes: 78108854 Test: tap on scrim, swipe notification Test: turn on flasing logs, look at logcat Test: go/sysui-bouncer-tests --- .../systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 5 +++-- 1 file changed, 3 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 f0bf3120d9d2..3f801b12023e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -165,8 +165,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb // • The user quickly taps on the display and we show "swipe up to unlock." // • Keyguard will be dismissed by an action. a.k.a: FLAG_DISMISS_KEYGUARD_ACTIVITY // • Full-screen user switcher is displayed. - if (mOccluded || mNotificationPanelView.isUnlockHintRunning() - || mBouncer.willDismissWithAction() + if (mNotificationPanelView.isUnlockHintRunning()) { + mBouncer.setExpansion(1); + } else if (mOccluded || mBouncer.willDismissWithAction() || mStatusBar.isFullScreenUserSwitcherState()) { mBouncer.setExpansion(0); } else if (mShowing && !mDozing) { -- 2.11.0