Skip to content

Commit 8dffc86

Browse files
romanbbDanesh
authored andcommitted
SystemUI: fix clock jumping when expanding QS from lockscreen
commit 4f965c5 fixed recalculating clock position from shade_locked but it didn't account for other scenarios such as when the QS is expanding, causing the clock to jump when expanding QS from lockscreen. Change-Id: I0e4f473fbc500f7dcdfa015cbedda07761c3cdb2 Signed-off-by: Roman Birg <[email protected]> (cherry picked from commit 6831615)
1 parent 023d336 commit 8dffc86

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,9 @@ private void updateEmptyShadeView() {
22582258

22592259
// Hide "No notifications" in QS.
22602260
mNotificationStackScroller.updateEmptyShadeView(mShadeEmpty && !mQsExpanded);
2261-
if (mStatusBarState == StatusBarState.KEYGUARD) {
2261+
if (mStatusBarState == StatusBarState.KEYGUARD
2262+
&& (!mQsExpanded || mQsExpandImmediate || mIsExpanding
2263+
&& mQsExpandedWhenExpandingStarted)) {
22622264
positionClockAndNotifications();
22632265
}
22642266
}

0 commit comments

Comments
 (0)