summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2015-07-02 00:35:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-02 00:35:45 +0000
commit0eb11ebe60e1a156bd506735ceb61f7367bae9e5 (patch)
tree309cb795801ace7e0adea93bab906d74cb107224 /res
parentbf991fec0a63e285949ac239251b010b313544b6 (diff)
parentb43e681023439ecec1bbb66431308a2ee483f4fa (diff)
downloadandroid_packages_apps_ExactCalculator-0eb11ebe60e1a156bd506735ceb61f7367bae9e5.tar.gz
android_packages_apps_ExactCalculator-0eb11ebe60e1a156bd506735ceb61f7367bae9e5.tar.bz2
android_packages_apps_ExactCalculator-0eb11ebe60e1a156bd506735ceb61f7367bae9e5.zip
am b43e6810: Tweak text sizes and padding to prevent clipping
* commit 'b43e681023439ecec1bbb66431308a2ee483f4fa': Tweak text sizes and padding to prevent clipping
Diffstat (limited to 'res')
-rw-r--r--res/values-land/styles.xml6
-rw-r--r--res/values-port/styles.xml2
-rw-r--r--res/values-sw400dp-land/styles.xml6
-rw-r--r--res/values-sw600dp-land/styles.xml8
-rw-r--r--res/values-sw600dp-port/styles.xml4
-rw-r--r--res/values-sw768dp-land/styles.xml2
6 files changed, 14 insertions, 14 deletions
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index afd278e..3730145 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -23,15 +23,15 @@
<item name="android:paddingBottom">6dip</item>
<item name="android:paddingStart">36dip</item>
<item name="android:paddingEnd">36dip</item>
- <item name="android:textSize">28sp</item>
+ <item name="android:textSize">24sp</item>
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">6dip</item>
+ <item name="android:paddingTop">8dip</item>
<item name="android:paddingBottom">12dip</item>
<item name="android:paddingStart">36dip</item>
<item name="android:paddingEnd">36dip</item>
- <item name="android:textSize">28sp</item>
+ <item name="android:textSize">24sp</item>
</style>
<style name="PadButtonStyle.Advanced">
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index 8cdf8c4..a6d2013 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -29,7 +29,7 @@
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">8dip</item>
+ <item name="android:paddingTop">10dip</item>
<item name="android:paddingBottom">32dip</item>
<item name="android:paddingStart">16dip</item>
<item name="android:paddingEnd">16dip</item>
diff --git a/res/values-sw400dp-land/styles.xml b/res/values-sw400dp-land/styles.xml
index bf863c2..e37e8a0 100644
--- a/res/values-sw400dp-land/styles.xml
+++ b/res/values-sw400dp-land/styles.xml
@@ -23,15 +23,15 @@
<item name="android:paddingBottom">10dip</item>
<item name="android:paddingStart">36dip</item>
<item name="android:paddingEnd">36dip</item>
- <item name="android:textSize">36sp</item>
+ <item name="android:textSize">32sp</item>
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">8dip</item>
+ <item name="android:paddingTop">12dip</item>
<item name="android:paddingBottom">18dip</item>
<item name="android:paddingStart">36dip</item>
<item name="android:paddingEnd">36dip</item>
- <item name="android:textSize">36sp</item>
+ <item name="android:textSize">32sp</item>
</style>
<style name="PadButtonStyle.Advanced">
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 0b0a10f..d25fe6b 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -23,15 +23,15 @@
<item name="android:paddingBottom">16dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
- <item name="android:textSize">48sp</item>
+ <item name="android:textSize">42sp</item>
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">16dip</item>
- <item name="android:paddingBottom">32dip</item>
+ <item name="android:paddingTop">18dip</item>
+ <item name="android:paddingBottom">30dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
- <item name="android:textSize">48sp</item>
+ <item name="android:textSize">42sp</item>
</style>
<style name="PadButtonStyle.Advanced">
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index 254880b..f439521 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -21,7 +21,7 @@
<style name="DisplayTextStyle.Formula">
<item name="android:paddingTop">16dip</item>
- <item name="android:paddingBottom">36dip</item>
+ <item name="android:paddingBottom">32dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
<item name="minTextSize">48sp</item>
@@ -30,7 +30,7 @@
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">16dip</item>
+ <item name="android:paddingTop">20dip</item>
<item name="android:paddingBottom">48dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
diff --git a/res/values-sw768dp-land/styles.xml b/res/values-sw768dp-land/styles.xml
index 22b3f08..162e5bc 100644
--- a/res/values-sw768dp-land/styles.xml
+++ b/res/values-sw768dp-land/styles.xml
@@ -29,7 +29,7 @@
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">16dip</item>
+ <item name="android:paddingTop">20dip</item>
<item name="android:paddingBottom">48dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>