SystemUI: Use Google Sans for the lockscreen clock

Change-Id: Icf0996e3ca01716c7877aa8f261fcdfa09785a12

4 files changed, 29 insertions, 2 deletions

diff --git a/packages/SystemUI/customization/res/font/clock.xml b/packages/SystemUI/customization/res/font/clock.xml
new file mode 100644
index 000000000000..5122fe74719b
--- /dev/null
+++ b/packages/SystemUI/customization/res/font/clock.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2020, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!--
+** AOD/LockScreen Clock font.
+** Should include all numeric glyphs in all supported locales.
+** Recommended: font with variable width to support AOD => LS animations
+-->
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:font="@font/google_sans_clock"/>
+</font-family>
\ No newline at end of file
diff --git a/packages/SystemUI/customization/res/font/google_sans_clock.ttf b/packages/SystemUI/customization/res/font/google_sans_clock.ttf
new file mode 100644
index 000000000000..5e683a05088c
--- /dev/null
+++ b/packages/SystemUI/customization/res/font/google_sans_clock.ttf
diff --git a/packages/SystemUI/customization/res/layout/clock_default_large.xml b/packages/SystemUI/customization/res/layout/clock_default_large.xml
index 0139d50dcfba..415f964a215f 100644
--- a/packages/SystemUI/customization/res/layout/clock_default_large.xml
+++ b/packages/SystemUI/customization/res/layout/clock_default_large.xml
@@ -23,7 +23,7 @@
     android:layout_gravity="center"
     android:gravity="center_horizontal"
     android:textSize="@dimen/large_clock_text_size"
-    android:fontFamily="@*android:string/config_clockFontFamily"
+    android:fontFamily="@font/clock"
     android:typeface="monospace"
     android:elegantTextHeight="false"
     chargeAnimationDelay="200"
diff --git a/packages/SystemUI/customization/res/layout/clock_default_small.xml b/packages/SystemUI/customization/res/layout/clock_default_small.xml
index ff6d7f9e2240..eb86ae50cbc9 100644
--- a/packages/SystemUI/customization/res/layout/clock_default_small.xml
+++ b/packages/SystemUI/customization/res/layout/clock_default_small.xml
@@ -23,7 +23,7 @@
     android:layout_gravity="start"
     android:gravity="start"
     android:textSize="@dimen/small_clock_text_size"
-    android:fontFamily="@*android:string/config_clockFontFamily"
+    android:fontFamily="@font/clock"
     android:elegantTextHeight="false"
     android:ellipsize="none"
     android:singleLine="true"