From 2850f8598b0395995ff176e2995b5c0d143b2a2c Mon Sep 17 00:00:00 2001
From: Sherry Zhou <yuandizhou@google.com>
Date: Thu, 24 Aug 2023 20:44:14 +0000
Subject: [PATCH] Fix overlap between smartspace and weather clock

Test: manually test on Felix
Bug: 286888430
Change-Id: I92286b1ef610b13b76c0f24ffe1fc3592e26fe9e
---
 .../SystemUI/res-keyguard/values-sw600dp-land/dimens.xml     | 2 +-
 .../packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml | 4 ++--
 .../base/packages/SystemUI/res-keyguard/values/dimens.xml    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
index d805e45..f43ddb6 100644
--- a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
@@ -19,5 +19,5 @@
     <!-- Weather clock smartspace scaling to apply for the weather clock on tablets -->
     <item name="weather_clock_smartspace_scale" type="dimen" format="float">0.85</item>
     <dimen name="weather_clock_smartspace_translateX">-40dp</dimen>
-    <dimen name="weather_clock_smartspace_translateY">-26dp</dimen>
+    <dimen name="weather_clock_smartspace_translateY">2dp</dimen>
 </resources>
diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
index d6c2dbb..7cdfaec 100644
--- a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
@@ -17,6 +17,6 @@
 -->
 <resources>
     <!-- Weather clock smartspace scaling to apply for the weather clock on tablets -->
-    <dimen name="weather_clock_smartspace_translateX">-8dp</dimen>
-    <dimen name="weather_clock_smartspace_translateY">-16dp</dimen>
+    <item name="weather_clock_smartspace_scale" type="dimen" format="float">0.85</item>
+    <dimen name="weather_clock_smartspace_translateX">-40dp</dimen>
 </resources>
diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
index d930b35..9cbf278 100644
--- a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -17,6 +17,7 @@
 -->
 <resources>
     <!-- Weather clock smartspace positioning to apply for the weather clock on tablets -->
-    <dimen name="weather_clock_smartspace_translateX">-15dp</dimen>
-    <dimen name="weather_clock_smartspace_translateY">-26dp</dimen>
+    <item name="weather_clock_smartspace_scale" type="dimen" format="float">0.85</item>
+    <dimen name="weather_clock_smartspace_translateX">-40dp</dimen>
+    <dimen name="weather_clock_smartspace_translateY">-5dp</dimen>
 </resources>