diff options
author | Justin Klaassen <justinklaassen@google.com> | 2015-05-28 17:55:20 -0700 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2015-05-29 16:19:59 -0700 |
commit | 4459516a2c116ddf80725d6a96a69186ccddc329 (patch) | |
tree | 7c606670ae5740cb05d08f4150a5ba2d44a28f05 /res/values-sw400dp-land | |
parent | 721ec84263a26b859c57eb9fb4eb66939fe94272 (diff) | |
download | android_packages_apps_ExactCalculator-4459516a2c116ddf80725d6a96a69186ccddc329.tar.gz android_packages_apps_ExactCalculator-4459516a2c116ddf80725d6a96a69186ccddc329.tar.bz2 android_packages_apps_ExactCalculator-4459516a2c116ddf80725d6a96a69186ccddc329.zip |
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
Diffstat (limited to 'res/values-sw400dp-land')
-rw-r--r-- | res/values-sw400dp-land/styles.xml | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/res/values-sw400dp-land/styles.xml b/res/values-sw400dp-land/styles.xml new file mode 100644 index 0000000..bf863c2 --- /dev/null +++ b/res/values-sw400dp-land/styles.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<!-- Styles for landscape phone (e.g. Nexus 4/5). --> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="DisplayTextStyle.Formula"> + <item name="android:paddingTop">2dip</item> + <item name="android:paddingBottom">10dip</item> + <item name="android:paddingStart">36dip</item> + <item name="android:paddingEnd">36dip</item> + <item name="android:textSize">36sp</item> + </style> + + <style name="DisplayTextStyle.Result"> + <item name="android:paddingTop">8dip</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> + </style> + + <style name="PadButtonStyle.Advanced"> + <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">17sp</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">15sp</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">27sp</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">24sp</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">15sp</item> + </style> + +</resources> |