Loading packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt +1 −1 Original line number Diff line number Diff line Loading @@ -94,7 +94,7 @@ constructor( } private fun updateResources() { useSplitShade = splitShadeStateController.shouldUseSplitNotificationShade(context.resources) useSplitShade = false // splitShadeStateController.shouldUseSplitNotificationShade(context.resources) } @VisibleForTesting Loading packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +0 −17 Original line number Diff line number Diff line Loading @@ -1768,23 +1768,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump @ClockSize private int computeDesiredClockSizeForSplitShade() { // Media is not visible to the user on AOD. boolean isMediaVisibleToUser = mMediaDataManager.hasActiveMediaOrRecommendation() && !isOnAod(); if (isMediaVisibleToUser) { // When media is visible, it overlaps with the large clock. Use small clock instead. return SMALL; } // To prevent the weather clock from overlapping with the notification shelf on AOD, we use // the small clock here // With migrateClocksToBlueprint, weather clock will have behaviors similar to other clocks if (!MigrateClocksToBlueprint.isEnabled()) { boolean bypassEnabled = mKeyguardBypassController.getBypassEnabled(); if (mKeyguardStatusViewController.isLargeClockBlockingNotificationShelf() && hasVisibleNotifications() && (isOnAod() || bypassEnabled)) { return SMALL; } } return LARGE; } Loading Loading
packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt +1 −1 Original line number Diff line number Diff line Loading @@ -94,7 +94,7 @@ constructor( } private fun updateResources() { useSplitShade = splitShadeStateController.shouldUseSplitNotificationShade(context.resources) useSplitShade = false // splitShadeStateController.shouldUseSplitNotificationShade(context.resources) } @VisibleForTesting Loading
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +0 −17 Original line number Diff line number Diff line Loading @@ -1768,23 +1768,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump @ClockSize private int computeDesiredClockSizeForSplitShade() { // Media is not visible to the user on AOD. boolean isMediaVisibleToUser = mMediaDataManager.hasActiveMediaOrRecommendation() && !isOnAod(); if (isMediaVisibleToUser) { // When media is visible, it overlaps with the large clock. Use small clock instead. return SMALL; } // To prevent the weather clock from overlapping with the notification shelf on AOD, we use // the small clock here // With migrateClocksToBlueprint, weather clock will have behaviors similar to other clocks if (!MigrateClocksToBlueprint.isEnabled()) { boolean bypassEnabled = mKeyguardBypassController.getBypassEnabled(); if (mKeyguardStatusViewController.isLargeClockBlockingNotificationShelf() && hasVisibleNotifications() && (isOnAod() || bypassEnabled)) { return SMALL; } } return LARGE; } Loading