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

Commit 410cf4ae authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android Build Coastguard Worker
Browse files

Use small weather clock during bypass 

Bug: 351137041
Flag: NONE simple bugfix
Test: Manually checked behavior
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3c474df081b3d80ec65f9846c63223c809d64633)
Merged-In: Ia6c2b8ccce2085e5f32c61adaf7bbca1d8c46326
Change-Id: Ia6c2b8ccce2085e5f32c61adaf7bbca1d8c46326
parent 2c4e80a2

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -1770,8 +1770,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        // 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()) {

                    && hasVisibleNotifications() && (isOnAod() || bypassEnabled)) {

                return SMALL;

            }

        }