From 7d8a0337d38baa963f14ef3637dbc76cf9678ff8 Mon Sep 17 00:00:00 2001
From: Nick Ning <nickning@google.com>
Date: Sat, 26 Mar 2022 22:59:13 +0000
Subject: [PATCH] Refactor common dream complication attributes in style.

Common dream complication view attributes had been defined in multiple places, e.g. clock subtitle widgets all have the same font size but were defined many times in multiple places. Refactored to a single place such that other similar complication entries such as AQI could be added using the same style.

Bug: 224784347
Test: manual
Change-Id: Id1efa1a7ea3add90a1721602a42a2fab367f9ffe
---
 .../dream_overlay_complication_clock_date.xml      |  9 ++-------
 .../layout/dream_overlay_complication_weather.xml  |  8 ++------
 packages/SystemUI/res/values/dimens.xml            |  3 +--
 packages/SystemUI/res/values/styles.xml            | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml
index cb63300f819b5..3f56bafef1343 100644
--- a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml
+++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml
@@ -17,13 +17,8 @@
 <TextClock
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/date_view"
+    style="@style/clock_subtitle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingHorizontal="@dimen/dream_overlay_complication_shadow_padding"
-    android:gravity="center_horizontal"
-    android:textColor="@android:color/white"
-    android:shadowColor="@color/keyguard_shadow_color"
-    android:shadowRadius="?attr/shadowRadius"
     android:format12Hour="EEE, MMM d"
-    android:format24Hour="EEE, MMM d"
-    android:textSize="@dimen/dream_overlay_complication_clock_date_text_size"/>
+    android:format24Hour="EEE, MMM d"/>
diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml b/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml
index 76fe58c298527..f05922fb395c0 100644
--- a/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml
+++ b/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml
@@ -17,10 +17,6 @@
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/weather_view"
+    style="@style/clock_subtitle"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="@dimen/dream_overlay_complication_shadow_padding"
-    android:textColor="@android:color/white"
-    android:shadowColor="@color/keyguard_shadow_color"
-    android:shadowRadius="?attr/shadowRadius"
-    android:textSize="@dimen/dream_overlay_complication_weather_text_size"/>
+    android:layout_height="wrap_content" />
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 5217dce3d9831..7702724cec16e 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1382,8 +1382,7 @@
 
     <!-- Dream overlay complications related dimensions -->
     <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen>
-    <dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen>
-    <dimen name="dream_overlay_complication_weather_text_size">18sp</dimen>
+    <dimen name="dream_overlay_complication_clock_subtitle_text_size">18sp</dimen>
     <dimen name="dream_overlay_complication_preview_text_size">36sp</dimen>
     <dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen>
     <dimen name="dream_overlay_complication_shadow_padding">2dp</dimen>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 96ce5454e7959..847aefdd67ce6 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -1133,4 +1133,18 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
+
+    <!-- Dream Overlay Complication UI styles -->
+    <style name="clock_subtitle">
+        <item name="android:textSize">@dimen/dream_overlay_complication_clock_subtitle_text_size
+        </item>
+        <item name="android:paddingHorizontal">@dimen/dream_overlay_complication_shadow_padding
+        </item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:shadowColor">@color/keyguard_shadow_color</item>
+        <item name="android:shadowRadius">?attr/shadowRadius</item>
+    </style>
 </resources>