From 912756af3eec04a0bb6dfbf8d5cf1da0632b75d8 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Fri, 22 Jan 2021 10:27:30 -0500 Subject: [PATCH] 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 --- .../statusbar/phone/NotificationPanelViewController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 2254ead99c849..b24d0e7762ad2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -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(),