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

Commit 69804ee4 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "AOD/LS - Switch to small clock with notifications and bypass"

parents cf4848b2 912756af

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

+2 −3
Original line number Diff line number Diff line
@@ -896,9 +896,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            int bottomPadding = Math.max(mIndicationBottomPadding, mAmbientIndicationBottomPadding);

            int clockPreferredY = mKeyguardStatusViewController.getClockPreferredY(totalHeight);

            boolean bypassEnabled = mKeyguardBypassController.getBypassEnabled();

            final boolean hasVisibleNotifications = !bypassEnabled

                    && (mNotificationStackScrollLayoutController.getVisibleNotificationCount() != 0

                    || mMediaDataManager.hasActiveMedia());

            final boolean hasVisibleNotifications = mNotificationStackScrollLayoutController

                    .getVisibleNotificationCount() != 0 || mMediaDataManager.hasActiveMedia();

            mKeyguardStatusViewController.setHasVisibleNotifications(hasVisibleNotifications);

            mClockPositionAlgorithm.setup(mStatusBarMinHeight, totalHeight - bottomPadding,

                    mNotificationStackScrollLayoutController.getIntrinsicContentHeight(),