commit | 904c4d1c4fe235e3e4c121bb72c1c8c3308ade5a | [log] [tgz] |
---|---|---|
author | felkachang <felkachang@google.com> | Wed Nov 07 00:33:31 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 07 00:33:31 2018 -0800 |
tree | 67e9068d0a04679c337a1fac4d0d81063a81fe89 | |
parent | 93e9b45644580a14dc8260c11812096dd00b0e5f [diff] | |
parent | 0317b241d890c5e7d9984305b4717566a84b8b09 [diff] |
Merge "fix overlay on status bar because of two clock" into pi-dev am: 0317b241d8 Change-Id: I31578280f1043338eae61c529a5b7a2a7a2cd024
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index f7b7eeb..43c8328 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
@@ -184,6 +184,14 @@ state |= DISABLE_SYSTEM_INFO; state |= DISABLE_CLOCK; } + + // In landscape, the heads up show but shouldHideNotificationIcons() return false + // because the visual icon is in notification icon area rather than heads up's space. + // whether the notification icon show or not, clock should hide when heads up show. + if (mStatusBarComponent.isHeadsUpShouldBeVisible()) { + state |= DISABLE_CLOCK; + } + if (mNetworkController != null && EncryptionHelper.IS_DATA_ENCRYPTED) { if (mNetworkController.hasEmergencyCryptKeeperText()) { state |= DISABLE_NOTIFICATION_ICONS;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 5c18782..f217a07 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -2532,7 +2532,8 @@ } private void updateStatusBarIcons() { - boolean showIconsWhenExpanded = isFullWidth() && getExpandedHeight() < getOpeningHeight(); + boolean showIconsWhenExpanded = (isPanelVisibleBecauseOfHeadsUp() || isFullWidth()) + && getExpandedHeight() < getOpeningHeight(); if (showIconsWhenExpanded && mNoVisibleNotifications && isOnKeyguard()) { showIconsWhenExpanded = false; }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 08ebc26..9f5ebe4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -2156,6 +2156,10 @@ } } + public boolean isHeadsUpShouldBeVisible() { + return mHeadsUpAppearanceController.shouldBeVisible(); + } + /** * All changes to the status bar and notifications funnel through here and are batched. */