diff options
| author | 2023-01-19 09:46:26 +0000 | |
|---|---|---|
| committer | 2023-01-19 09:46:26 +0000 | |
| commit | 310e7c59dc3639aa421ecab9d209ad42a1e9a2bc (patch) | |
| tree | 7def9062f1acf3b92cced122057cda02da7ab72f | |
| parent | ae5da340f0e7757e322a3eff92cc2e59251436d8 (diff) | |
| parent | 5eafbd822b7fe2d5c03e291cb4d32498374d4f2a (diff) | |
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>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index bf4a768c5710..b532c134c3a2 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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) { |