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 | |
| 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
31 files changed, 530 insertions, 280 deletions
diff --git a/res/values-w230dp-h220dp/dimens.xml b/res/values-w230dp-h220dp/dimens.xml new file mode 100644 index 0000000..e0fde7f --- /dev/null +++ b/res/values-w230dp-h220dp/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">0dip</dimen> + <dimen name="formula_padding_bottom">0dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">28dip</dimen> + <dimen name="formula_max_textsize">28dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">0dip</dimen> + <dimen name="result_padding_bottom">0dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">28dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w230dp-h220dp/styles.xml b/res/values-w230dp-h220dp/styles.xml index 88a52ce..cc04758 100644 --- a/res/values-w230dp-h220dp/styles.xml +++ b/res/values-w230dp-h220dp/styles.xml @@ -17,26 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="minTextSize">28dip</item> - <item name="maxTextSize">28dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="android:textSize">28dip</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> diff --git a/res/values-w230dp-h275dp/dimens.xml b/res/values-w230dp-h275dp/dimens.xml new file mode 100644 index 0000000..d969266 --- /dev/null +++ b/res/values-w230dp-h275dp/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">0dip</dimen> + <dimen name="formula_padding_bottom">0dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">28dip</dimen> + <dimen name="formula_max_textsize">28dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">0dip</dimen> + <dimen name="result_padding_bottom">0dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">28dip</dimen> +</resources> diff --git a/res/values-w230dp-h275dp/styles.xml b/res/values-w230dp-h275dp/styles.xml index 2f715a3..bbb38be 100644 --- a/res/values-w230dp-h275dp/styles.xml +++ b/res/values-w230dp-h275dp/styles.xml @@ -17,26 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="minTextSize">28dip</item> - <item name="maxTextSize">28dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="android:textSize">28dip</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> diff --git a/res/values-w230dp-h375dp/dimens.xml b/res/values-w230dp-h375dp/dimens.xml new file mode 100644 index 0000000..a747231 --- /dev/null +++ b/res/values-w230dp-h375dp/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">16dip</dimen> + <dimen name="formula_padding_end">16dip</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">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">32dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w230dp-h375dp/styles.xml b/res/values-w230dp-h375dp/styles.xml index 4aa32d8..c72fd3f 100644 --- a/res/values-w230dp-h375dp/styles.xml +++ b/res/values-w230dp-h375dp/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">16dip</item> - <item name="android:paddingEnd">16dip</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">16dip</item> - <item name="android:paddingEnd">16dip</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> diff --git a/res/values-w230dp-h475dp-port/dimens.xml b/res/values-w230dp-h475dp-port/dimens.xml new file mode 100644 index 0000000..072a06e --- /dev/null +++ b/res/values-w230dp-h475dp-port/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">8dip</dimen> + <dimen name="formula_padding_bottom">18dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">32dip</dimen> + <dimen name="formula_max_textsize">56dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">18dip</dimen> + <dimen name="result_padding_bottom">36dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">32dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w230dp-h475dp-port/styles.xml b/res/values-w230dp-h475dp-port/styles.xml index 050de1e..05987ad 100644 --- a/res/values-w230dp-h475dp-port/styles.xml +++ b/res/values-w230dp-h475dp-port/styles.xml @@ -17,24 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">18dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="minTextSize">32dip</item> - <item name="maxTextSize">56dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">18dip</item> - <item name="android:paddingBottom">36dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</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> diff --git a/res/values-w375dp-h220dp/dimens.xml b/res/values-w375dp-h220dp/dimens.xml new file mode 100644 index 0000000..e0fde7f --- /dev/null +++ b/res/values-w375dp-h220dp/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">0dip</dimen> + <dimen name="formula_padding_bottom">0dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">28dip</dimen> + <dimen name="formula_max_textsize">28dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">0dip</dimen> + <dimen name="result_padding_bottom">0dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">28dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w375dp-h220dp/styles.xml b/res/values-w375dp-h220dp/styles.xml index 3c6fe85..16931ff 100644 --- a/res/values-w375dp-h220dp/styles.xml +++ b/res/values-w375dp-h220dp/styles.xml @@ -17,26 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="minTextSize">28dip</item> - <item name="maxTextSize">28dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="android:textSize">28dip</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> diff --git a/res/values-w375dp-h275dp/dimens.xml b/res/values-w375dp-h275dp/dimens.xml new file mode 100644 index 0000000..e0fde7f --- /dev/null +++ b/res/values-w375dp-h275dp/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">0dip</dimen> + <dimen name="formula_padding_bottom">0dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">28dip</dimen> + <dimen name="formula_max_textsize">28dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">0dip</dimen> + <dimen name="result_padding_bottom">0dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">28dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w375dp-h275dp/styles.xml b/res/values-w375dp-h275dp/styles.xml index c628645..efed4dc 100644 --- a/res/values-w375dp-h275dp/styles.xml +++ b/res/values-w375dp-h275dp/styles.xml @@ -17,26 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="minTextSize">28dip</item> - <item name="maxTextSize">28dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:gravity">bottom</item> - <item name="android:textSize">28dip</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> diff --git a/res/values-w375dp-h375dp/dimens.xml b/res/values-w375dp-h375dp/dimens.xml new file mode 100644 index 0000000..a747231 --- /dev/null +++ b/res/values-w375dp-h375dp/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">16dip</dimen> + <dimen name="formula_padding_end">16dip</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">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">32dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w375dp-h375dp/styles.xml b/res/values-w375dp-h375dp/styles.xml index 14e96ca..b1d4ac5 100644 --- a/res/values-w375dp-h375dp/styles.xml +++ b/res/values-w375dp-h375dp/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">16dip</item> - <item name="android:paddingEnd">16dip</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">16dip</item> - <item name="android:paddingEnd">16dip</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> diff --git a/res/values-w375dp-h500dp-port/dimens.xml b/res/values-w375dp-h500dp-port/dimens.xml new file mode 100644 index 0000000..37508de --- /dev/null +++ b/res/values-w375dp-h500dp-port/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">16dip</dimen> + <dimen name="formula_padding_bottom">28dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">42dip</dimen> + <dimen name="formula_max_textsize">74dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">16dip</dimen> + <dimen name="result_padding_bottom">42dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">42dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w375dp-h500dp-port/styles.xml b/res/values-w375dp-h500dp-port/styles.xml index 066aa8e..5f5057e 100644 --- a/res/values-w375dp-h500dp-port/styles.xml +++ b/res/values-w375dp-h500dp-port/styles.xml @@ -17,24 +17,6 @@ <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">42dip</item> - <item name="maxTextSize">74dip</item> - <item name="stepTextSize">8dip</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">42dip</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> diff --git a/res/values-w375dp-h768dp-port/dimens.xml b/res/values-w375dp-h768dp-port/dimens.xml new file mode 100644 index 0000000..e74d35d --- /dev/null +++ b/res/values-w375dp-h768dp-port/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">16dip</dimen> + <dimen name="formula_padding_bottom">32dip</dimen> + <dimen name="formula_padding_start">44dip</dimen> + <dimen name="formula_padding_end">44dip</dimen> + <dimen name="formula_min_textsize">48dip</dimen> + <dimen name="formula_max_textsize">72dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">20dip</dimen> + <dimen name="result_padding_bottom">48dip</dimen> + <dimen name="result_padding_start">44dip</dimen> + <dimen name="result_padding_end">44dip</dimen> + <dimen name="result_textsize">48dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w375dp-h768dp-port/styles.xml b/res/values-w375dp-h768dp-port/styles.xml index ec91033..2c5ae35 100644 --- a/res/values-w375dp-h768dp-port/styles.xml +++ b/res/values-w375dp-h768dp-port/styles.xml @@ -17,24 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <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="minTextSize">48dip</item> - <item name="maxTextSize">72dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">20dip</item> - <item name="android:paddingBottom">48dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">48dip</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> diff --git a/res/values-w520dp-h220dp-land/dimens.xml b/res/values-w520dp-h220dp-land/dimens.xml new file mode 100644 index 0000000..b1ef149 --- /dev/null +++ b/res/values-w520dp-h220dp-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">0dip</dimen> + <dimen name="formula_padding_bottom">0dip</dimen> + <dimen name="formula_padding_start">36dip</dimen> + <dimen name="formula_padding_end">36dip</dimen> + <dimen name="formula_min_textsize">28dip</dimen> + <dimen name="formula_max_textsize">28dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">0dip</dimen> + <dimen name="result_padding_bottom">0dip</dimen> + <dimen name="result_padding_start">36dip</dimen> + <dimen name="result_padding_end">36dip</dimen> + <dimen name="result_textsize">28dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w520dp-h220dp-land/styles.xml b/res/values-w520dp-h220dp-land/styles.xml index e90e530..536d5e7 100644 --- a/res/values-w520dp-h220dp-land/styles.xml +++ b/res/values-w520dp-h220dp-land/styles.xml @@ -17,26 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">36dip</item> - <item name="android:paddingEnd">36dip</item> - <item name="android:gravity">bottom</item> - <item name="minTextSize">28dip</item> - <item name="maxTextSize">28dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:paddingStart">36dip</item> - <item name="android:paddingEnd">36dip</item> - <item name="android:gravity">bottom</item> - <item name="android:textSize">28dip</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> diff --git a/res/values-w520dp-h275dp-land/dimens.xml b/res/values-w520dp-h275dp-land/dimens.xml new file mode 100644 index 0000000..b00f26e --- /dev/null +++ b/res/values-w520dp-h275dp-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">8dip</dimen> + <dimen name="formula_padding_start">36dip</dimen> + <dimen name="formula_padding_end">36dip</dimen> + <dimen name="formula_min_textsize">28dip</dimen> + <dimen name="formula_max_textsize">28dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">8dip</dimen> + <dimen name="result_padding_bottom">16dip</dimen> + <dimen name="result_padding_start">36dip</dimen> + <dimen name="result_padding_end">36dip</dimen> + <dimen name="result_textsize">28dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w520dp-h275dp-land/styles.xml b/res/values-w520dp-h275dp-land/styles.xml index 9d66a9b..003949e 100644 --- a/res/values-w520dp-h275dp-land/styles.xml +++ b/res/values-w520dp-h275dp-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">8dip</item> - <item name="android:paddingStart">36dip</item> - <item name="android:paddingEnd">36dip</item> - <item name="minTextSize">28dip</item> - <item name="maxTextSize">28dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">16dip</item> - <item name="android:paddingStart">36dip</item> - <item name="android:paddingEnd">36dip</item> - <item name="android:textSize">28dip</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> 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> diff --git a/res/values-w520dp-h500dp-land/dimens.xml b/res/values-w520dp-h500dp-land/dimens.xml new file mode 100644 index 0000000..37508de --- /dev/null +++ b/res/values-w520dp-h500dp-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">16dip</dimen> + <dimen name="formula_padding_bottom">28dip</dimen> + <dimen name="formula_padding_start">16dip</dimen> + <dimen name="formula_padding_end">16dip</dimen> + <dimen name="formula_min_textsize">42dip</dimen> + <dimen name="formula_max_textsize">74dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">16dip</dimen> + <dimen name="result_padding_bottom">42dip</dimen> + <dimen name="result_padding_start">16dip</dimen> + <dimen name="result_padding_end">16dip</dimen> + <dimen name="result_textsize">42dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w520dp-h500dp-land/styles.xml b/res/values-w520dp-h500dp-land/styles.xml index 883f6cd..e0cc0e2 100644 --- a/res/values-w520dp-h500dp-land/styles.xml +++ b/res/values-w520dp-h500dp-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">16dip</item> - <item name="android:paddingBottom">28dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="minTextSize">42dip</item> - <item name="maxTextSize">74dip</item> - <item name="stepTextSize">8dip</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">42dip</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> diff --git a/res/values-w520dp-h768dp-land/dimens.xml b/res/values-w520dp-h768dp-land/dimens.xml new file mode 100644 index 0000000..69b2f01 --- /dev/null +++ b/res/values-w520dp-h768dp-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">24dip</dimen> + <dimen name="formula_padding_bottom">32dip</dimen> + <dimen name="formula_padding_start">44dip</dimen> + <dimen name="formula_padding_end">44dip</dimen> + <dimen name="formula_min_textsize">44dip</dimen> + <dimen name="formula_max_textsize">76dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">24dip</dimen> + <dimen name="result_padding_bottom">56dip</dimen> + <dimen name="result_padding_start">44dip</dimen> + <dimen name="result_padding_end">44dip</dimen> + <dimen name="result_textsize">44dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w520dp-h768dp-land/styles.xml b/res/values-w520dp-h768dp-land/styles.xml index 9fdf68a..61acbd2 100644 --- a/res/values-w520dp-h768dp-land/styles.xml +++ b/res/values-w520dp-h768dp-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">24dip</item> - <item name="android:paddingBottom">32dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">44dip</item> - <item name="maxTextSize">76dip</item> - <item name="stepTextSize">8dip</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">44dip</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> diff --git a/res/values-w520dp-h768dp-port/dimens.xml b/res/values-w520dp-h768dp-port/dimens.xml new file mode 100644 index 0000000..e74d35d --- /dev/null +++ b/res/values-w520dp-h768dp-port/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">16dip</dimen> + <dimen name="formula_padding_bottom">32dip</dimen> + <dimen name="formula_padding_start">44dip</dimen> + <dimen name="formula_padding_end">44dip</dimen> + <dimen name="formula_min_textsize">48dip</dimen> + <dimen name="formula_max_textsize">72dip</dimen> + <dimen name="formula_step_textsize">8dip</dimen> + + <!-- Dimens for display result. --> + <dimen name="result_padding_top">20dip</dimen> + <dimen name="result_padding_bottom">48dip</dimen> + <dimen name="result_padding_start">44dip</dimen> + <dimen name="result_padding_end">44dip</dimen> + <dimen name="result_textsize">48dip</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-w520dp-h768dp-port/styles.xml b/res/values-w520dp-h768dp-port/styles.xml index 4d5e2db..9136b50 100644 --- a/res/values-w520dp-h768dp-port/styles.xml +++ b/res/values-w520dp-h768dp-port/styles.xml @@ -17,24 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> - <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="minTextSize">48dip</item> - <item name="maxTextSize">72dip</item> - <item name="stepTextSize">8dip</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">20dip</item> - <item name="android:paddingBottom">48dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">48dip</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> diff --git a/res/values/styles.xml b/res/values/styles.xml index ef3597a..a15cc31 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,6 +26,26 @@ <item name="android:textAlignment">viewEnd</item> </style> + <style name="DisplayTextStyle.Formula"> + <item name="android:paddingTop">@dimen/formula_padding_top</item> + <item name="android:paddingBottom">@dimen/formula_padding_bottom</item> + <item name="android:paddingStart">@dimen/formula_padding_start</item> + <item name="android:paddingEnd">@dimen/formula_padding_end</item> + <item name="android:gravity">bottom</item> + <item name="minTextSize">@dimen/formula_min_textsize</item> + <item name="maxTextSize">@dimen/formula_max_textsize</item> + <item name="stepTextSize">@dimen/formula_step_textsize</item> + </style> + + <style name="DisplayTextStyle.Result"> + <item name="android:paddingTop">@dimen/result_padding_top</item> + <item name="android:paddingBottom">@dimen/result_padding_bottom</item> + <item name="android:paddingStart">@dimen/result_padding_start</item> + <item name="android:paddingEnd">@dimen/result_padding_end</item> + <item name="android:gravity">bottom</item> + <item name="android:textSize">@dimen/result_textsize</item> + </style> + <style name="PadButtonStyle" parent="@android:style/Widget.Material.Light.Button.Borderless"> <item name="android:layout_width">0dip</item> <item name="android:layout_height">0dip</item> |