Merge "Split-shade: show status bar earlier when closing shade" into tm-qpr-dev

This commit is contained in:
Christian Göllner
2023-01-19 08:45:51 +00:00
committed by Android (Google) Code Review

View File

@@ -4186,9 +4186,7 @@ public final class NotificationPanelViewController implements Dumpable {
} }
private void updateStatusBarIcons() { private void updateStatusBarIcons() {
boolean showIconsWhenExpanded = boolean showIconsWhenExpanded = getExpandedHeight() < getOpeningHeight();
(isPanelVisibleBecauseOfHeadsUp() || mIsFullWidth)
&& getExpandedHeight() < getOpeningHeight();
if (showIconsWhenExpanded && isOnKeyguard()) { if (showIconsWhenExpanded && isOnKeyguard()) {
showIconsWhenExpanded = false; showIconsWhenExpanded = false;
} }
@@ -4255,7 +4253,7 @@ public final class NotificationPanelViewController implements Dumpable {
&& mHeadsUpAppearanceController.shouldBeVisible()) { && mHeadsUpAppearanceController.shouldBeVisible()) {
return false; return false;
} }
return !mIsFullWidth || !mShowIconsWhenExpanded; return !mShowIconsWhenExpanded;
} }
private void onQsPanelScrollChanged(int scrollY) { private void onQsPanelScrollChanged(int scrollY) {