From 4459516a2c116ddf80725d6a96a69186ccddc329 Mon Sep 17 00:00:00 2001
From: Justin Klaassen <justinklaassen@google.com>
Date: Thu, 28 May 2015 17:55:20 -0700
Subject: Polish display and evaluate animation

Bug: 20915670
Bug: 21489377

- Adjust font metrics across all supported device configurations to
  support font scaling and min touch size requirements.
- Support proper font scaling for non-scrollable results when performing
  the evaluate animation.
- Remove restriction for only using 4/5 of the width of the result
  display (NOTE: the result's textSize must match the formula's
  minTextSize).
- Add AlignedTextView base class to ensure formula/result padding is
  based on the displayed text's ascent/baseline.

Change-Id: Id53e9bdc6e699fb05fdf331a6a472ecc170edf38
---
 res/values-sw600dp-land/styles.xml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'res/values-sw600dp-land')

diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 603a392..0b0a10f 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -19,23 +19,22 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="DisplayTextStyle.Formula">
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">52dip</item>
+        <item name="android:paddingTop">4dip</item>
+        <item name="android:paddingBottom">16dip</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">0dip</item>
-        <item name="android:paddingBottom">46dip</item>
+        <item name="android:paddingTop">16dip</item>
+        <item name="android:paddingBottom">32dip</item>
         <item name="android:paddingStart">44dip</item>
         <item name="android:paddingEnd">44dip</item>
-        <item name="android:textSize">36sp</item>
+        <item name="android:textSize">48sp</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
-        <item name="android:layout_margin">6dip</item>
         <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">27sp</item>
@@ -47,7 +46,6 @@
     </style>
 
     <style name="PadButtonStyle.Numeric">
-        <item name="android:layout_margin">6dip</item>
         <item name="android:textSize">36sp</item>
     </style>
 
@@ -56,7 +54,6 @@
     </style>
 
     <style name="PadButtonStyle.Operator">
-        <item name="android:layout_margin">6dip</item>
         <item name="android:textSize">36sp</item>
     </style>
 
@@ -67,25 +64,25 @@
 
     <style name="PadLayoutStyle.Advanced">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">508</item>
+        <item name="android:layout_weight">500</item>
         <item name="android:paddingTop">10dip</item>
         <item name="android:paddingBottom">10dip</item>
         <item name="android:paddingStart">18dip</item>
-        <item name="android:paddingEnd">22dip</item>
+        <item name="android:paddingEnd">18dip</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">532</item>
+        <item name="android:layout_weight">500</item>
         <item name="android:paddingTop">10dip</item>
         <item name="android:paddingBottom">10dip</item>
-        <item name="android:paddingStart">22dip</item>
+        <item name="android:paddingStart">18dip</item>
         <item name="android:paddingEnd">18dip</item>
     </style>
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">240</item>
+        <item name="android:layout_weight">280</item>
         <item name="android:paddingTop">10dip</item>
         <item name="android:paddingBottom">10dip</item>
         <item name="android:paddingStart">18dip</item>
-- 
cgit v1.2.3