diff options
| author | Lucas Dupin <dupin@google.com> | 2017-06-27 23:11:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 23:11:20 +0000 |
| commit | 33a36f60fe5f7f7069b572a8656139bbafb9f990 (patch) | |
| tree | 9470ae5aaf91a7d0d1964307c0c00e8fe4a920ff | |
| parent | 8051d20d2db9145309d7adbbb0216065481e11c7 (diff) | |
| parent | 532caf3e8e52963334d723eff6cc4d09754fce5e (diff) | |
| download | packages_apps_PhoneCommon-33a36f60fe5f7f7069b572a8656139bbafb9f990.tar.gz packages_apps_PhoneCommon-33a36f60fe5f7f7069b572a8656139bbafb9f990.tar.bz2 packages_apps_PhoneCommon-33a36f60fe5f7f7069b572a8656139bbafb9f990.zip | |
Revert "Emergency dialer font and sizes" am: 05359c683a
am: 532caf3e8e
Change-Id: I15901e9223e5cbfdc80c1ef26c0673b8099bd811
| -rw-r--r-- | res/layout/dialpad_view_unthemed.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml index 78a4ead..0516a36 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="@*android:string/config_headlineFontFamily" + android:fontFamily="sans-serif" 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 418a3f6..7734bd4 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">32sp</dimen> + <dimen name="dialpad_digits_text_size">34sp</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">124dp</dimen> + <dimen name="dialpad_bottom_space_height">80dp</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 7488e5d..3ec34c1 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">@*android:string/config_headlineFontFamilyLight</item> + <item name="android:fontFamily">sans-serif-light</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">@*android:string/config_headlineFontFamilyLight</item> + <item name="android:fontFamily">sans-serif-light</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">@*android:string/config_headlineFontFamilyLight</item> + <item name="android:fontFamily">sans-serif-light</item> <item name="android:alpha">0.8</item> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> |