From 81affc1f1fea1249c87215e092fd7e979be9f39a Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 13 Jan 2021 14:48:01 -0500
Subject: [PATCH] Update LS/AOD clock

- Center hours, only show one digit for hours if starts with 0.
- Decrease vertical spacing
- Remove horizontal letterSpacing adjustment (will be taken care within
the font file)
- Update color to use textColorPrimary

Test: manual
Bug: 170228350
Change-Id: I66d990eef8579ff56876ff12e1398198e515ec41
---
 .../res-keyguard/layout/keyguard_clock_switch.xml      | 10 ++++------
 .../android/keyguard/AnimatableClockController.java    |  7 +++----
 .../src/com/android/keyguard/AnimatableClockView.java  |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
index 55bdebd2f5824..80c8a285bfc6e 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
@@ -51,7 +51,6 @@
              android:layout_height="wrap_content"
              android:layout_gravity="bottom|center_horizontal"
              android:gravity="center_horizontal"
-             android:letterSpacing="0.03"
              android:textColor="?attr/wallpaperTextColor"
              android:singleLine="true"
              style="@style/widget_title_bold"
@@ -72,12 +71,12 @@
             android:id="@+id/animatable_clock_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="right"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
             android:textSize="100dp"
-            android:letterSpacing="0.02"
-            android:lineSpacingMultiplier=".8"
             android:includeFontPadding="false"
             android:fontFamily="@font/clock"
+            android:lineSpacingMultiplier=".65"
             android:typeface="monospace"
             android:elegantTextHeight="false"
             dozeWeight="200"
@@ -97,9 +96,8 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
             android:textSize="@dimen/large_clock_text_size"
-            android:letterSpacing="0.02"
-            android:lineSpacingMultiplier=".8"
             android:includeFontPadding="false"
+            android:lineSpacingMultiplier=".65"
             android:fontFamily="@font/clock"
             android:typeface="monospace"
             android:elegantTextHeight="false"
diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
index 7c6a27446c786..302a2620aac0c 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
@@ -85,10 +85,9 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
     }
 
     private void initColors() {
-        mLockScreenColors[0] = Utils.getColorAttrDefaultColor(getContext(),
-                com.android.systemui.R.attr.wallpaperTextColor);
-        mLockScreenColors[1] = Utils.getColorAttrDefaultColor(getContext(),
-                        com.android.systemui.R.attr.wallpaperTextColorSecondary);
+        mLockScreenColors[0] = Utils.getColorAttr(getContext(),
+                android.R.attr.textColorPrimary).getDefaultColor();
+        mLockScreenColors[1] = mLockScreenColors[0]; // same color
         mView.setColors(mDozingColors, mLockScreenColors);
         mView.animateDoze(mIsDozing, false);
     }
diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
index ca99563986b42..62d30935dd5c6 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
@@ -38,7 +38,7 @@ import kotlin.Unit;
  * The time's text color is a gradient that changes its colors based on its controller.
  */
 public class AnimatableClockView extends TextView {
-    private static final CharSequence FORMAT_12_HOUR = "hh\nmm";
+    private static final CharSequence FORMAT_12_HOUR = "h\nmm";
     private static final CharSequence FORMAT_24_HOUR = "HH\nmm";
     private static final long ANIM_DURATION = 300;