am e43900a5: am 1ede2bdb: Merge "Change digital clock widget font to match new lockscreen font." into ub-deskclock-business

* commit 'e43900a5b8da96b09acf32abe0ab76d212a69f9e':
  Change digital clock widget font to match new lockscreen font.

6 files changed, 27 insertions, 2 deletions

diff --git a/res/values-sw360dp-v23/dimens.xml b/res/values-sw360dp-v23/dimens.xml
new file mode 100644
index 000000000..73447373c
--- /dev/null
+++ b/res/values-sw360dp-v23/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Use dp on purpose to ensure consistency across multiple screen sizes. -->
+    <dimen name="widget_label_font_size">10dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw360dp/dimens.xml b/res/values-sw360dp/dimens.xml
new file mode 100644
index 000000000..3f4aa1323
--- /dev/null
+++ b/res/values-sw360dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="big_font_size">70sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 447606351..0a56ca755 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -40,7 +40,7 @@
     <dimen name="clock_side_padding">48dip</dimen>
     <dimen name="clock_side_padding_reduced">36dip</dimen>
 
-    <dimen name="big_font_size">160sp</dimen>
+    <dimen name="big_font_size">115sp</dimen>
     <dimen name="medium_font_size">96sp</dimen>
     <dimen name="label_font_size">18sp</dimen>
     <dimen name="alarm_label_size">18sp</dimen>
diff --git a/res/values-v23/dimens.xml b/res/values-v23/dimens.xml
new file mode 100644
index 000000000..e41bee061
--- /dev/null
+++ b/res/values-v23/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Use dp on purpose to ensure consistency across multiple screen sizes. -->
+    <dimen name="widget_label_font_size">9dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-v23/styles.xml b/res/values-v23/styles.xml
index a8561bd7d..0b7ddbdab 100644
--- a/res/values-v23/styles.xml
+++ b/res/values-v23/styles.xml
@@ -9,4 +9,15 @@
         <item name="android:textColor">@color/timepicker_ampm</item>
         <item name="android:textSize">16sp</item>
     </style>
+
+    <style name="widget_big_thin" parent="big_thin">
+        <item name="android:textSize">@dimen/widget_big_font_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
+    <style name="widget_label" parent="label">
+        <item name="android:textSize">@dimen/widget_label_font_size</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:letterSpacing">0.15</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c29c19f54..1d919b3d3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -67,7 +67,7 @@
     <dimen name="alarm_lockscreen_pulse_radius">128dp</dimen>
     <dimen name="alarm_lockscreen_bottom_margin">40dp</dimen>
 
-    <dimen name="big_font_size">88sp</dimen>
+    <dimen name="big_font_size">60sp</dimen>
     <dimen name="medium_font_size">56sp</dimen>
     <dimen name="small_font_size">32sp</dimen>
     <dimen name="label_font_size">16sp</dimen>