summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2015-04-20 10:27:12 -0700
committerHans Boehm <hboehm@google.com>2015-04-20 18:47:55 -0700
commit760a9dc6573e35bcbf9097dece06cd90c4abb551 (patch)
tree4a8eefbed4561fcd7df4a1d10aa41a2fe3e11f30 /res
parent76b78159dc27a365e1cd9fc07379607893d016f6 (diff)
downloadandroid_packages_apps_ExactCalculator-760a9dc6573e35bcbf9097dece06cd90c4abb551.tar.gz
android_packages_apps_ExactCalculator-760a9dc6573e35bcbf9097dece06cd90c4abb551.tar.bz2
android_packages_apps_ExactCalculator-760a9dc6573e35bcbf9097dece06cd90c4abb551.zip
Fix result overlap, clear logic, display bugs, etc.
Adjust result padding to prevent overlapping with options menu, resulting in inability to access options menu. Reset state correctly after clear, preventing occasional crashes. Do this at end of animation to prevent animation glitches. Have clear but the display in a state in which COPY does nothing interesting. Treat a not-known-to-be-exact zero result better. Before this we displayed it as just "0", giving the mistaken impression of exactness. It is unclear whether we should display it as "0.00000000" or add an exponent to indicate the real evaluation precision. The former probably works better for beginners; the latter for experts. We now do the former, which is probably right. Also correctly save and restore not-yet analyzed characters. Change-Id: Iac46d0d3b5a06f61beb6af7d4f0910e43284f52b
Diffstat (limited to 'res')
-rw-r--r--res/values-land/styles.xml4
-rw-r--r--res/values-port/styles.xml4
-rw-r--r--res/values-sw600dp-land/styles.xml4
-rw-r--r--res/values-sw600dp-port/styles.xml4
-rw-r--r--res/values-sw800dp-land/styles.xml4
-rw-r--r--res/values-sw800dp-port/styles.xml6
6 files changed, 13 insertions, 13 deletions
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 074796a..1cfcf4f 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -20,14 +20,14 @@
<style name="DisplayEditTextStyle.Formula">
<item name="android:paddingTop">0dip</item>
- <item name="android:paddingBottom">6dip</item>
+ <item name="android:paddingBottom">12dip</item>
<item name="android:paddingStart">32dip</item>
<item name="android:paddingEnd">32dip</item>
<item name="android:textSize">30sp</item>
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">6dip</item>
+ <item name="android:paddingTop">0dip</item>
<item name="android:paddingBottom">12dip</item>
<item name="android:paddingStart">32dip</item>
<item name="android:paddingEnd">32dip</item>
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index a067b48..aae4ca1 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -20,7 +20,7 @@
<style name="DisplayEditTextStyle.Formula">
<item name="android:paddingTop">8dip</item>
- <item name="android:paddingBottom">16dip</item>
+ <item name="android:paddingBottom">24dip</item>
<item name="android:paddingStart">16dip</item>
<item name="android:paddingEnd">16dip</item>
<item name="minTextSize">36sp</item>
@@ -29,7 +29,7 @@
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">16dip</item>
+ <item name="android:paddingTop">8dip</item>
<item name="android:paddingBottom">32dip</item>
<item name="android:paddingStart">16dip</item>
<item name="android:paddingEnd">16dip</item>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 18774f2..dcbfeb4 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -20,14 +20,14 @@
<style name="DisplayEditTextStyle.Formula">
<item name="android:paddingTop">0dip</item>
- <item name="android:paddingBottom">26dip</item>
+ <item name="android:paddingBottom">52dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
<item name="android:textSize">48sp</item>
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">26dip</item>
+ <item name="android:paddingTop">0dip</item>
<item name="android:paddingBottom">46dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index b5f1569..623f4c0 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -21,7 +21,7 @@
<style name="DisplayEditTextStyle.Formula">
<item name="android:paddingTop">16dip</item>
- <item name="android:paddingBottom">32dip</item>
+ <item name="android:paddingBottom">48dip</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">32dip</item>
+ <item name="android:paddingTop">16dip</item>
<item name="android:paddingBottom">90dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw800dp-land/styles.xml
index a5bfdd3..b834d8c 100644
--- a/res/values-sw800dp-land/styles.xml
+++ b/res/values-sw800dp-land/styles.xml
@@ -20,7 +20,7 @@
<style name="DisplayEditTextStyle.Formula">
<item name="android:paddingTop">16dip</item>
- <item name="android:paddingBottom">26dip</item>
+ <item name="android:paddingBottom">42dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
<item name="minTextSize">56sp</item>
@@ -29,7 +29,7 @@
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">26dip</item>
+ <item name="android:paddingTop">10dip</item>
<item name="android:paddingBottom">46dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml
index 47e88f1..881a033 100644
--- a/res/values-sw800dp-port/styles.xml
+++ b/res/values-sw800dp-port/styles.xml
@@ -20,7 +20,7 @@
<style name="DisplayEditTextStyle.Formula">
<item name="android:paddingTop">16dip</item>
- <item name="android:paddingBottom">32dip</item>
+ <item name="android:paddingBottom">68dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
<item name="minTextSize">56sp</item>
@@ -29,8 +29,8 @@
</style>
<style name="DisplayTextStyle.Result">
- <item name="android:paddingTop">32dip</item>
- <item name="android:paddingBottom">90dip</item>
+ <item name="android:paddingTop">6dip</item>
+ <item name="android:paddingBottom">80dip</item>
<item name="android:paddingStart">44dip</item>
<item name="android:paddingEnd">44dip</item>
<item name="android:textSize">40sp</item>