Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Josh Tsuji
2021-10-12 14:43:59 -04:00
parent 429a39689f
commit 6ab3eb7c81
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4364,9 +4364,16 @@ public class NotificationPanelViewController extends PanelViewController {
}
}
} else {
mKeyguardStatusBarViewController.updateViewState(
/* alpha= */ 1f,
keyguardShowing ? View.VISIBLE : View.INVISIBLE);
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();