summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2017-06-26 18:06:59 -0700
committerLucas Dupin <dupin@google.com>2017-06-27 09:32:38 -0700
commite457f725b820c70a2c2182bae5baf5b23cc88de3 (patch)
tree9f4559dcb2b06392676f450282b8deb4ee27dbbd
parentabd4b9781ae655f97393ba2a5fc8bd10e54c18a5 (diff)
downloadpackages_apps_PhoneCommon-e457f725b820c70a2c2182bae5baf5b23cc88de3.tar.gz
packages_apps_PhoneCommon-e457f725b820c70a2c2182bae5baf5b23cc88de3.tar.bz2
packages_apps_PhoneCommon-e457f725b820c70a2c2182bae5baf5b23cc88de3.zip
Emergency dialer font and sizes
Change-Id: I854632c218be86af4803214e50b627576278d33f Fixes: 62411556 Bug: 62785536
-rw-r--r--res/layout/dialpad_view_unthemed.xml2
-rw-r--r--res/values/dimens.xml4
-rw-r--r--res/values/styles.xml6
3 files changed, 6 insertions, 6 deletions
diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml
index 0516a36..78a4ead 100644
--- a/res/layout/dialpad_view_unthemed.xml
+++ b/res/layout/dialpad_view_unthemed.xml
@@ -111,7 +111,7 @@
android:cursorVisible="false"
android:textColor="?attr/dialpad_text_color"
android:textCursorDrawable="@null"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_headlineFontFamily"
android:textStyle="normal"
ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7734bd4..418a3f6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -30,7 +30,7 @@
<dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
<dimen name="dialpad_key_plus_size">18sp</dimen>
<dimen name="dialpad_horizontal_padding">5dp</dimen>
- <dimen name="dialpad_digits_text_size">34sp</dimen>
+ <dimen name="dialpad_digits_text_size">32sp</dimen>
<dimen name="dialpad_digits_text_min_size">24sp</dimen>
<dimen name="dialpad_digits_height">60dp</dimen>
<!-- Provide adjustable dimensions so that different apps can use different dialpad sizes. -->
@@ -47,7 +47,7 @@
<dimen name="dialpad_space_above_keys">14dp</dimen>
<dimen name="dialpad_space_below_keys">8dp</dimen>
<!-- The bottom space of the dialpad to account for the dial button -->
- <dimen name="dialpad_bottom_space_height">80dp</dimen>
+ <dimen name="dialpad_bottom_space_height">124dp</dimen>
<!-- Height of the floating action button -->
<dimen name="floating_action_button_height">56dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3ec34c1..7488e5d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,7 +30,7 @@
<style name="DialpadKeyNumberStyle">
<item name="android:textColor">?attr/dialpad_text_color_primary</item>
<item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">@dimen/dialpad_key_number_margin_bottom</item>
@@ -44,7 +44,7 @@
<style name="DialpadKeyStarStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">@dimen/dialpad_key_star_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
<item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
@@ -55,7 +55,7 @@
<style name="DialpadKeyPoundStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">@dimen/dialpad_key_pound_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
<item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>