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

Commit 912756af authored by Matt Pietal's avatar Matt Pietal
Browse files

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

Ignore the bypass setting when determining clock size. Always show the
small clock if any notifications are visible, whether expanded or on
the shelf.

Fixes: 177461617
Test: manual, test with bypass
Change-Id: Id88d80e17a94352f433c9f1135f76208b6c61ef7
parent de044a60

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(),