Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904c4d1c authored by felkachang's avatar felkachang Committed by android-build-merger
Browse files

Merge "fix overlay on status bar because of two clock" into pi-dev 

am: 0317b241

Change-Id: I31578280f1043338eae61c529a5b7a2a7a2cd024
parents 93e9b456 0317b241

packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java

+8 −0
Original line number Diff line number Diff line
@@ -184,6 +184,14 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
            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;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −1
Original line number Diff line number Diff line
@@ -2532,7 +2532,8 @@ public class NotificationPanelView extends PanelView implements 
    }



    private void updateStatusBarIcons() {

        boolean showIconsWhenExpanded = isFullWidth() && getExpandedHeight() < getOpeningHeight();

        boolean showIconsWhenExpanded = (isPanelVisibleBecauseOfHeadsUp() || isFullWidth())

                && getExpandedHeight() < getOpeningHeight();

        if (showIconsWhenExpanded && mNoVisibleNotifications && isOnKeyguard()) {

            showIconsWhenExpanded = false;

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −0
Original line number Diff line number Diff line
@@ -2156,6 +2156,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
        }

    }



    public boolean isHeadsUpShouldBeVisible() {

        return mHeadsUpAppearanceController.shouldBeVisible();

    }



    /**

     * All changes to the status bar and notifications funnel through here and are batched.

     */