Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80aeafc5 authored by Matt Pietal's avatar Matt Pietal
Browse files

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
parent 468ccad0

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -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.