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

Commit b5bcf495 authored by Felka Chang's avatar Felka Chang Committed by Android (Google) Code Review
Browse files

Merge "fix overlay on status bar because of two clock"

parents 32cceb50 ca4eee83

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

+8 −0
Original line number Diff line number Diff line
@@ -189,6 +189,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
@@ -2533,7 +2533,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
@@ -2155,6 +2155,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.

     */