Merge "Split-shade: show status bar earlier when closing shade" into tm-qpr-dev am: 0ddb66c913 am: 5eafbd822b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21018945

Change-Id: Ia4e68e40821688f4394fdf16876782a979993b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christian Göllner
2023-01-19 09:46:26 +00:00
committed by Automerger Merge Worker

View File

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