summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-07-29 22:01:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-29 21:36:00 +0000
commit593b21e1d3d05dbf35936d56beaab0f518ac7080 (patch)
tree11d2742184d55593d971ef948f1b5c0bbab29d7d /res/values
parentcb6909f223dc75958a6048405e106ead2ad5edc2 (diff)
parent9764a8206a5b5771e13fdfaaf467adbe5d3a8b24 (diff)
downloadandroid_packages_apps_PhoneCommon-593b21e1d3d05dbf35936d56beaab0f518ac7080.tar.gz
android_packages_apps_PhoneCommon-593b21e1d3d05dbf35936d56beaab0f518ac7080.tar.bz2
android_packages_apps_PhoneCommon-593b21e1d3d05dbf35936d56beaab0f518ac7080.zip
Merge "Shift padding between letters and numbers move overflow icon left." into lmp-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml5
-rw-r--r--res/values/styles.xml4
2 files changed, 8 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 67947dd..41c6426 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,7 +21,9 @@
<dimen name="dialpad_key_pound_size">23sp</dimen>
<dimen name="dialpad_key_star_size">36sp</dimen>
<dimen name="dialpad_key_height">64dp</dimen>
- <dimen name="dialpad_key_number_margin_bottom">2dp</dimen>
+ <dimen name="dialpad_key_number_margin_bottom">3dp</dimen>
+ <!-- Zero key should have less space between self and text because "+" is smaller -->
+ <dimen name="dialpad_zero_key_number_margin_bottom">1dp</dimen>
<dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
<!-- The bottom row of the dialpad is slightly taller to account for the dial button -->
<dimen name="dialpad_bottom_key_height">65dp</dimen>
@@ -31,6 +33,7 @@
<dimen name="dialpad_digits_text_min_size">24sp</dimen>
<dimen name="dialpad_digits_height">64dp</dimen>
<dimen name="dialpad_digits_padding">16dp</dimen>
+ <dimen name="dialpad_digits_menu_left_padding">8dp</dimen>
<dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
<dimen name="dialpad_center_margin">3dp</dimen>
<dimen name="dialpad_button_margin">2dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5685c92..df649d6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,6 +31,10 @@
<item name="android:gravity">center</item>
</style>
+ <style name="DialpadBottomKeyNumberStyle" parent="DialpadKeyNumberStyle">
+ <item name="android:layout_marginBottom">@dimen/dialpad_zero_key_number_margin_bottom</item>
+ </style>
+
<style name="DialpadKeyStarStyle">
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
<item name="android:textSize">@dimen/dialpad_key_star_size</item>