Merge "Split-shade: show status bar earlier when closing shade" into tm-qpr-dev am: 0ddb66c913
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21018945 Change-Id: Iac3a883fcb2dda29b3845b25b8c8369b95a7bfa1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user