From 80aeafc595fd9dd8b45aeefdfa423d0cb8df9e6c Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Tue, 24 May 2022 09:25:43 -0400 Subject: Fix bouncer flicker on lockscreen shade transition Both CentralSurfacesImpl and StatusBarKeyguardViewManager are attempting to control bouncer visibility on shade collapse, leading to potential conflict. Let StatusBarKeyguardViewManager handle this scenario. Fixes: 232948170 Test: From home, power off, power on, swipe down to see notifs, swipe up Change-Id: I1a1ad69b71887052eb208d6d6c1f3b7783a1834a --- .../com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 5c12671726f4..8203987cd7d6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -107,7 +107,6 @@ import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.view.accessibility.AccessibilityManager; import android.widget.DateTimeView; -import android.window.SplashScreen; import androidx.annotation.NonNull; import androidx.lifecycle.Lifecycle; @@ -3508,11 +3507,6 @@ public class CentralSurfacesImpl extends CoreStartable implements @Override public void onTrackingStopped(boolean expand) { - if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { - if (!expand && !mKeyguardStateController.canDismissLockScreen()) { - mStatusBarKeyguardViewManager.showBouncer(false /* scrimmed */); - } - } } // TODO: Figure out way to remove these. -- cgit v1.2.3-59-g8ed1b