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

Commit 6ab3eb7c authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Don't show the keyguard status bar if we're animating the screen off. 

Fixes: 201001767
Test: turn off the screen. currently no practical way to add a test because the status bar is only briefly visible during screen off
Change-Id: I447f5c9ccb7958b9210892fd4821c88868460a81
parent 429a3968

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

+10 −3
Original line number Diff line number Diff line
@@ -4364,9 +4364,16 @@ public class NotificationPanelViewController extends PanelViewController { 
                    }

                }

            } else {

                final boolean animatingUnlockedShadeToKeyguard = oldState == SHADE

                        && statusBarState == KEYGUARD

                        && mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying();

                if (!animatingUnlockedShadeToKeyguard) {

                    // Only make the status bar visible if we're not animating the screen off, since

                    // we only want to be showing the clock/notifications during the animation.

                    mKeyguardStatusBarViewController.updateViewState(

                            /* alpha= */ 1f,

                            keyguardShowing ? View.VISIBLE : View.INVISIBLE);

                }

                if (keyguardShowing && oldState != mBarState) {

                    if (mQs != null) {

                        mQs.hideImmediately();