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
This commit is contained in:
Matt Pietal
2021-01-22 10:27:30 -05:00
parent de044a60ac
commit 912756af3e

View File

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