diff options
| author | Annie Chin <afchin@google.com> | 2016-10-26 12:10:00 -0700 |
|---|---|---|
| committer | Annie Chin <afchin@google.com> | 2016-10-28 09:24:01 -0700 |
| commit | d4fac42faa6bd1813aa052b16642d2b7503536e5 (patch) | |
| tree | b060adf86cae5c93a3767e7e5e6689ae9eaf0cbe /res/values-w520dp-h375dp-land | |
| parent | e637b47baca4896c46f7ee01d58eb9da553be7f8 (diff) | |
| download | android_packages_apps_ExactCalculator-d4fac42faa6bd1813aa052b16642d2b7503536e5.tar.gz android_packages_apps_ExactCalculator-d4fac42faa6bd1813aa052b16642d2b7503536e5.tar.bz2 android_packages_apps_ExactCalculator-d4fac42faa6bd1813aa052b16642d2b7503536e5.zip | |
Use dimens to specify styling for display formula and result.
Bug: 31623549
Change-Id: Ief18dc41887fb1496599eefe7d63d8f476718734
Diffstat (limited to 'res/values-w520dp-h375dp-land')
| -rw-r--r-- | res/values-w520dp-h375dp-land/dimens.xml | 34 | ||||
| -rw-r--r-- | res/values-w520dp-h375dp-land/styles.xml | 18 |
2 files changed, 34 insertions, 18 deletions
diff --git a/res/values-w520dp-h375dp-land/dimens.xml b/res/values-w520dp-h375dp-land/dimens.xml new file mode 100644 index 0000000..7cfeb8e --- /dev/null +++ b/res/values-w520dp-h375dp-land/dimens.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 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. + --> + +<resources> + <!-- Dimens for display formula. --> + <dimen name="formula_padding_top">2dip</dimen> + <dimen name="formula_padding_bottom">10dip</dimen> + <dimen name="formula_padding_start">36dip</dimen> + <dimen name="formula_padding_end">36dip</dimen> + <dimen name="formula_min_textsize">32dip</dimen> + <dimen name="formula_max_textsize">32dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">12dip</dimen> + <dimen name="result_padding_bottom">18dip</dimen> + <dimen name="result_padding_start">36dip</dimen> + <dimen name="result_padding_end">36dip</dimen> + <dimen name="result_textsize">32dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w520dp-h375dp-land/styles.xml b/res/values-w520dp-h375dp-land/styles.xml index d89ea24..8c7d0ed 100644 --- a/res/values-w520dp-h375dp-land/styles.xml +++ b/res/values-w520dp-h375dp-land/styles.xml @@ -17,24 +17,6 @@ <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="minTextSize">32dip</item> - <item name="maxTextSize">32dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <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">32dip</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> |