From b741b754b8a775c7c3a43d3a3faffecc00b28d4b Mon Sep 17 00:00:00 2001
From: Hawkwood Glazier <jglazier@google.com>
Date: Thu, 18 May 2023 16:37:35 +0000
Subject: [PATCH] Switch to small clock in split shade in certain edge
 scenarios

The large weather clock can overlap the notification shelf when it
switches to the left side in AOD. This is avoided by swapping the clock
into the small version for this specific scenario.

Bug: 283103625
Test: Manually checked swapping clock during AOD transition for jank
Change-Id: Iea694b9e14d0f5183dacb73044c20d70213accea
---
 .../android/keyguard/KeyguardStatusViewController.java    | 8 ++++++++
 .../systemui/shade/NotificationPanelViewController.java   | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
index 794eeda86b0fc..1db0ab65e44f4 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
@@ -314,6 +314,14 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
         }
     }
 
+    /**
+     * Returns true if the large clock will block the notification shelf in AOD
+     */
+    public boolean isLargeClockBlockingNotificationShelf() {
+        ClockController clock = mKeyguardClockSwitchController.getClock();
+        return clock != null && clock.getLargeClock().getConfig().getHasCustomWeatherDataDisplay();
+    }
+
     /**
      * Updates the alignment of the KeyguardStatusView and animates the transition if requested.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index 0fdd7ca1564f6..784a360929223 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -1570,6 +1570,12 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
             // 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
+        if (mKeyguardStatusViewController.isLargeClockBlockingNotificationShelf()
+                && hasVisibleNotifications() && isOnAod()) {
+            return SMALL;
+        }
         return LARGE;
     }