SystemUI: Move media to notifications in split, LARGE clock (e198f4c9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ constructor(
		}

		private fun updateResources() {
		useSplitShade = splitShadeStateController.shouldUseSplitNotificationShade(context.resources)
		useSplitShade = false // splitShadeStateController.shouldUseSplitNotificationShade(context.resources)
		}

		@VisibleForTesting

+0 −16

Original line number	Diff line number	Diff line
		@@ -1755,22 +1755,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()) {
		if (mKeyguardStatusViewController.isLargeClockBlockingNotificationShelf()
		&& hasVisibleNotifications() && isOnAod()) {
		return SMALL;
		}
		}
		return LARGE;
		}