From 69fa1c2818c5e19e86ddec018b32656b50aeeff4 Mon Sep 17 00:00:00 2001
From: Martin <martinolsson@google.com>
Date: Wed, 27 Sep 2023 11:21:00 +0200
Subject: Fix font type and size for ProgressDialogMessage

This CL changes the font type and font size for
the style ProgressDialogMessage to match style
TextAppearance.WearMaterial.Body4 in SysUI

Restarting... before:
https://hsv.googleplex.com/4842145841152000

Restarting... after:
https://hsv.googleplex.com/6604982200565760

Shutting down... before:
https://hsv.googleplex.com/6247958430351360

Shutting down... after:
https://hsv.googleplex.com/6219525478416384

This also changes the font type and size of
"Resetting device" when factory resetting.

Screenshots from Main:
Restarting: https://hsv.googleplex.com/4716923032961024
Shutdown: https://hsv.googleplex.com/5951262274093056

Defer-CP-To-Master: 302265343
Test: manually check the strings
Bug: 301493816
Bug: 302265343
Change-Id: Ia66a315c61e76590959e0cdb34d48055444f3102
(cherry picked from commit e77f90175021c2abb37829ea04a45f297c15be6a)
---
 core/res/res/values-watch/dimens_material.xml | 3 ++-
 core/res/res/values-watch/styles_material.xml | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values-watch/dimens_material.xml b/core/res/res/values-watch/dimens_material.xml
index 2ab2d91058e2..8becb0880f97 100644
--- a/core/res/res/values-watch/dimens_material.xml
+++ b/core/res/res/values-watch/dimens_material.xml
@@ -47,11 +47,12 @@
     <dimen name="progress_bar_height">24dp</dimen>
 
     <!-- Progress bar message dimens -->
-    <dimen name="message_progress_dialog_text_size">18sp</dimen>
+    <dimen name="message_progress_dialog_text_size">14sp</dimen>
     <dimen name="message_progress_dialog_bottom_padding">80px</dimen>
     <dimen name="message_progress_dialog_top_padding">0dp</dimen>
     <dimen name="message_progress_dialog_start_padding">0dp</dimen>
     <dimen name="message_progress_dialog_end_padding">0dp</dimen>
+    <item name="message_progress_dialog_letter_spacing" format="float" type="dimen">0.021</item>
 
     <!-- fallback for screen percentage widths -->
     <dimen name="screen_percentage_05">0dp</dimen>
diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml
index 8698e86ba5f9..f3e412dc948e 100644
--- a/core/res/res/values-watch/styles_material.xml
+++ b/core/res/res/values-watch/styles_material.xml
@@ -100,7 +100,9 @@ please see styles_device_defaults.xml.
 
     <style name="ProgressDialogMessage">
         <item name="android:textAlignment">center</item>
-        <item name="textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
+        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:letterSpacing">@dimen/message_progress_dialog_letter_spacing</item>
+        <item name="textColor">?attr/textColorPrimary</item>
         <item name="textSize">@dimen/message_progress_dialog_text_size</item>
         <item name="paddingBottom">@dimen/message_progress_dialog_bottom_padding</item>
         <item name="paddingEnd">@dimen/message_progress_dialog_end_padding</item>
-- 
cgit v1.2.3-59-g8ed1b