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

Commit 083452ed authored by Kshitij's avatar Kshitij Committed by Nishith Khanna
Browse files

SystemUI: Move media to notifications in split, LARGE clock

parent 6b19b5c1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ constructor(
    }

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

    @VisibleForTesting
+0 −17
Original line number Diff line number Diff line
@@ -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;
    }