diff options
author | Justin Klaassen <justinklaassen@google.com> | 2015-05-29 23:57:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-29 23:57:52 +0000 |
commit | d43ed7ede9ee50d276fd5fc2a7b2a878b8033b87 (patch) | |
tree | b19cbdf66217146ed25b688e0e38cffe4f4ab5e5 /res | |
parent | 96657d213be37f8096d24af93c412881924b8f4f (diff) | |
parent | 97f58a51b399a591122c96bf0b2e9ba4afb5602a (diff) | |
download | android_packages_apps_ExactCalculator-d43ed7ede9ee50d276fd5fc2a7b2a878b8033b87.tar.gz android_packages_apps_ExactCalculator-d43ed7ede9ee50d276fd5fc2a7b2a878b8033b87.tar.bz2 android_packages_apps_ExactCalculator-d43ed7ede9ee50d276fd5fc2a7b2a878b8033b87.zip |
am 97f58a51: Merge "Polish display and evaluate animation" into mnc-dev
* commit '97f58a51b399a591122c96bf0b2e9ba4afb5602a':
Polish display and evaluate animation
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/display.xml | 4 | ||||
-rw-r--r-- | res/values-land/styles.xml | 25 | ||||
-rw-r--r-- | res/values-port/styles.xml | 9 | ||||
-rw-r--r-- | res/values-sw400dp-land/styles.xml | 61 | ||||
-rw-r--r-- | res/values-sw400dp-port/styles.xml | 63 | ||||
-rw-r--r-- | res/values-sw600dp-land/styles.xml | 23 | ||||
-rw-r--r-- | res/values-sw600dp-port/styles.xml | 27 | ||||
-rw-r--r-- | res/values-sw768dp-land/styles.xml (renamed from res/values-sw800dp-land/styles.xml) | 54 | ||||
-rw-r--r-- | res/values-sw768dp-port/styles.xml | 63 | ||||
-rw-r--r-- | res/values-sw800dp-port/styles.xml | 109 |
10 files changed, 227 insertions, 211 deletions
diff --git a/res/layout/display.xml b/res/layout/display.xml index 56b0e6b..52182a4 100644 --- a/res/layout/display.xml +++ b/res/layout/display.xml @@ -51,10 +51,6 @@ android:textColor="@color/display_formula_text_color" android:textIsSelectable="false" /> - <!-- - We lay the result out to full width, but are careful to use only - 4/5 of the space, so that we have room when we expand. - --> <com.android.calculator2.CalculatorResult android:id="@+id/result" style="@style/DisplayTextStyle.Result" diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index bbda604..afd278e 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -19,26 +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">12dip</item> - <item name="android:paddingStart">32dip</item> - <item name="android:paddingEnd">32dip</item> - <item name="android:textSize">30sp</item> + <item name="android:paddingTop">2dip</item> + <item name="android:paddingBottom">6dip</item> + <item name="android:paddingStart">36dip</item> + <item name="android:paddingEnd">36dip</item> + <item name="android:textSize">28sp</item> </style> <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">0dip</item> + <item name="android:paddingTop">6dip</item> <item name="android:paddingBottom">12dip</item> - <item name="android:paddingStart">32dip</item> - <item name="android:paddingEnd">32dip</item> + <item name="android:paddingStart">36dip</item> + <item name="android:paddingEnd">36dip</item> <item name="android:textSize">28sp</item> </style> <style name="PadButtonStyle.Advanced"> - <item name="android:layout_marginTop">4dip</item> - <item name="android:layout_marginBottom">4dip</item> - <item name="android:layout_marginStart">8dip</item> - <item name="android:layout_marginEnd">8dip</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">15sp</item> @@ -50,7 +46,6 @@ </style> <style name="PadButtonStyle.Numeric"> - <item name="android:layout_margin">4dip</item> <item name="android:textSize">23sp</item> </style> @@ -59,10 +54,6 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:layout_marginTop">4dip</item> - <item name="android:layout_marginBottom">4dip</item> - <item name="android:layout_marginStart">8dip</item> - <item name="android:layout_marginEnd">8dip</item> <item name="android:textSize">20sp</item> </style> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index a3b1867..8cdf8c4 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -23,8 +23,8 @@ <item name="android:paddingBottom">24dip</item> <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> - <item name="minTextSize">36sp</item> - <item name="maxTextSize">64sp</item> + <item name="minTextSize">32sp</item> + <item name="maxTextSize">56sp</item> <item name="stepTextSize">8sp</item> </style> @@ -33,11 +33,10 @@ <item name="android:paddingBottom">32dip</item> <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> - <item name="android:textSize">28sp</item> + <item name="android:textSize">32sp</item> </style> <style name="PadButtonStyle.Advanced"> - <item name="android:layout_margin">4dip</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">20sp</item> @@ -49,7 +48,6 @@ </style> <style name="PadButtonStyle.Numeric"> - <item name="android:layout_margin">4dip</item> <item name="android:textSize">32sp</item> </style> @@ -58,7 +56,6 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:layout_margin">8dip</item> <item name="android:textSize">23sp</item> </style> 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> diff --git a/res/values-sw400dp-port/styles.xml b/res/values-sw400dp-port/styles.xml new file mode 100644 index 0000000..c715d52 --- /dev/null +++ b/res/values-sw400dp-port/styles.xml @@ -0,0 +1,63 @@ +<?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 portrait phone (e.g. Nexus 4/5). --> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="DisplayTextStyle.Formula"> + <item name="android:paddingTop">16dip</item> + <item name="android:paddingBottom">28dip</item> + <item name="android:paddingStart">16dip</item> + <item name="android:paddingEnd">16dip</item> + <item name="minTextSize">42sp</item> + <item name="maxTextSize">74sp</item> + <item name="stepTextSize">8sp</item> + </style> + + <style name="DisplayTextStyle.Result"> + <item name="android:paddingTop">16dip</item> + <item name="android:paddingBottom">42dip</item> + <item name="android:paddingStart">16dip</item> + <item name="android:paddingEnd">16dip</item> + <item name="android:textSize">42sp</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">23sp</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">20sp</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">36sp</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">27sp</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">20sp</item> + </style> + +</resources> 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> diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml index efb1033..254880b 100644 --- a/res/values-sw600dp-port/styles.xml +++ b/res/values-sw600dp-port/styles.xml @@ -21,27 +21,23 @@ <style name="DisplayTextStyle.Formula"> <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">48dip</item> + <item name="android:paddingBottom">36dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> <item name="minTextSize">48sp</item> - <item name="maxTextSize">80sp</item> + <item name="maxTextSize">72sp</item> <item name="stepTextSize">8sp</item> </style> <style name="DisplayTextStyle.Result"> <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">90dip</item> + <item name="android:paddingBottom">48dip</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_marginTop">8dip</item> - <item name="android:layout_marginBottom">8dip</item> - <item name="android:layout_marginStart">12dip</item> - <item name="android:layout_marginEnd">12dip</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> @@ -53,7 +49,6 @@ </style> <style name="PadButtonStyle.Numeric"> - <item name="android:layout_margin">8dip</item> <item name="android:textSize">36sp</item> </style> @@ -62,10 +57,6 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:layout_marginTop">8dip</item> - <item name="android:layout_marginBottom">8dip</item> - <item name="android:layout_marginStart">16dip</item> - <item name="android:layout_marginEnd">16dip</item> <item name="android:textSize">36sp</item> </style> @@ -76,7 +67,7 @@ <style name="PadLayoutStyle.Advanced"> <item name="android:layout_height">0dip</item> - <item name="android:layout_weight">256</item> + <item name="android:layout_weight">264</item> <item name="android:paddingTop">8dip</item> <item name="android:paddingBottom">8dip</item> <item name="android:paddingStart">16dip</item> @@ -85,7 +76,7 @@ <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">8dip</item> <item name="android:paddingBottom">8dip</item> <item name="android:paddingStart">16dip</item> @@ -94,17 +85,17 @@ <style name="PadLayoutStyle.Operator"> <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">240</item> + <item name="android:layout_weight">264</item> <item name="android:paddingTop">8dip</item> <item name="android:paddingBottom">8dip</item> - <item name="android:paddingStart">0dip</item> + <item name="android:paddingStart">8dip</item> <item name="android:paddingEnd">8dip</item> </style> <style name="PadLinearLayoutStyle"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">0dip</item> - <item name="android:layout_weight">508</item> + <item name="android:layout_weight">500</item> </style> </resources> diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw768dp-land/styles.xml index 807f568..22b3f08 100644 --- a/res/values-sw800dp-land/styles.xml +++ b/res/values-sw768dp-land/styles.xml @@ -20,78 +20,44 @@ <style name="DisplayTextStyle.Formula"> <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">42dip</item> + <item name="android:paddingBottom">32dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> <item name="minTextSize">56sp</item> - <item name="maxTextSize">96sp</item> + <item name="maxTextSize">72sp</item> <item name="stepTextSize">8sp</item> </style> <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">10dip</item> - <item name="android:paddingBottom">46dip</item> + <item name="android:paddingTop">16dip</item> + <item name="android:paddingBottom">48dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">40sp</item> + <item name="android:textSize">56sp</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">36sp</item> + <item name="android:textSize">30sp</item> </style> <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">32sp</item> + <item name="android:textSize">26sp</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:layout_margin">6dip</item> - <item name="android:textSize">48sp</item> - </style> - - <style name="PadButtonStyle.Numeric.Equals"> - <item name="android:visibility">gone</item> + <item name="android:textSize">36sp</item> </style> <style name="PadButtonStyle.Operator"> - <item name="android:layout_margin">6dip</item> - <item name="android:textSize">48sp</item> + <item name="android:textSize">36sp</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">32sp</item> - </style> - - <style name="PadLayoutStyle.Advanced"> - <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">508</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> - </style> - - <style name="PadLayoutStyle.Numeric"> - <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">532</item> - <item name="android:paddingTop">10dip</item> - <item name="android:paddingBottom">10dip</item> - <item name="android:paddingStart">22dip</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:paddingTop">10dip</item> - <item name="android:paddingBottom">10dip</item> - <item name="android:paddingStart">18dip</item> - <item name="android:paddingEnd">18dip</item> + <item name="android:textSize">26sp</item> </style> </resources> diff --git a/res/values-sw768dp-port/styles.xml b/res/values-sw768dp-port/styles.xml new file mode 100644 index 0000000..c9bceba --- /dev/null +++ b/res/values-sw768dp-port/styles.xml @@ -0,0 +1,63 @@ +<?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 portrait 800dip-wide tablet (e.g. Nexus 10). --> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="DisplayTextStyle.Formula"> + <item name="android:paddingTop">24dip</item> + <item name="android:paddingBottom">32dip</item> + <item name="android:paddingStart">44dip</item> + <item name="android:paddingEnd">44dip</item> + <item name="minTextSize">56sp</item> + <item name="maxTextSize">80sp</item> + <item name="stepTextSize">8sp</item> + </style> + + <style name="DisplayTextStyle.Result"> + <item name="android:paddingTop">24dip</item> + <item name="android:paddingBottom">56dip</item> + <item name="android:paddingStart">44dip</item> + <item name="android:paddingEnd">44dip</item> + <item name="android:textSize">56sp</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">32sp</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item>s + <item name="android:textSize">28sp</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">38sp</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">38sp</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">28sp</item> + </style> + +</resources> diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml deleted file mode 100644 index 8ce7a12..0000000 --- a/res/values-sw800dp-port/styles.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?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 portrait 800dip-wide tablet (e.g. Nexus 10). --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">68dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">56sp</item> - <item name="maxTextSize">96sp</item> - <item name="stepTextSize">8sp</item> - </style> - - <style name="DisplayTextStyle.Result"> - <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> - </style> - - <style name="PadButtonStyle.Advanced"> - <item name="android:layout_marginTop">8dip</item> - <item name="android:layout_marginBottom">8dip</item> - <item name="android:layout_marginStart">12dip</item> - <item name="android:layout_marginEnd">12dip</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">36sp</item> - </style> - - <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">32sp</item> - </style> - - <style name="PadButtonStyle.Numeric"> - <item name="android:layout_margin">8dip</item> - <item name="android:textSize">48sp</item> - </style> - - <style name="PadButtonStyle.Numeric.Equals"> - <item name="android:visibility">gone</item> - </style> - - <style name="PadButtonStyle.Operator"> - <item name="android:layout_marginTop">8dip</item> - <item name="android:layout_marginBottom">8dip</item> - <item name="android:layout_marginStart">16dip</item> - <item name="android:layout_marginEnd">16dip</item> - <item name="android:textSize">48sp</item> - </style> - - <style name="PadButtonStyle.Operator.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">32sp</item> - </style> - - <style name="PadLayoutStyle.Advanced"> - <item name="android:layout_height">0dip</item> - <item name="android:layout_weight">256</item> - <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">8dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - </style> - - <style name="PadLayoutStyle.Numeric"> - <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">532</item> - <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">8dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - </style> - - <style name="PadLayoutStyle.Operator"> - <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">240</item> - <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">8dip</item> - <item name="android:paddingStart">0dip</item> - <item name="android:paddingEnd">8dip</item> - </style> - - <style name="PadLinearLayoutStyle"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">0dip</item> - <item name="android:layout_weight">508</item> - </style> - -</resources> |