summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-05-24 09:25:43 -0400
committer Matt Pietal <mpietal@google.com> 2022-05-24 09:45:58 -0400
commit80aeafc595fd9dd8b45aeefdfa423d0cb8df9e6c (patch)
tree5d7811305d70292b797d22bde97615e4afb2bee0
parent468ccad0f6da04d32c91303be7633978618c1168 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java6
1 files changed, 0 insertions, 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.