diff options
author | Michael Chan <mchan@android.com> | 2011-05-26 17:52:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 17:52:40 -0700 |
commit | ddd8c9f9b9cb586e7ea9f9836953d297a744d6ea (patch) | |
tree | 94bd2153a3aa88f435b854dec20719eb9721b339 /res | |
parent | fb5a66525388e77458f47ebff4fbdb5b2e3af3f2 (diff) | |
parent | 365083a83f88d75e8637403e781be4bbc2c7ea67 (diff) | |
download | android_packages_apps_ExactCalculator-ddd8c9f9b9cb586e7ea9f9836953d297a744d6ea.tar.gz android_packages_apps_ExactCalculator-ddd8c9f9b9cb586e7ea9f9836953d297a744d6ea.tar.bz2 android_packages_apps_ExactCalculator-ddd8c9f9b9cb586e7ea9f9836953d297a744d6ea.zip |
am 365083a8: 7in fixes for Calculator
* commit '365083a83f88d75e8637403e781be4bbc2c7ea67':
7in fixes for Calculator
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-sw600dp-hdpi/calc_clear_symbol.png (renamed from res/drawable-xlarge-hdpi/calc_clear_symbol.png) | bin | 1970 -> 1970 bytes | |||
-rw-r--r-- | res/drawable-sw600dp-hdpi/calculator_input_field.9.png (renamed from res/drawable-xlarge-hdpi/calculator_input_field.9.png) | bin | 1365 -> 1365 bytes | |||
-rw-r--r-- | res/drawable-sw600dp-mdpi/calc_clear_symbol.png (renamed from res/drawable-xlarge-mdpi/calc_clear_symbol.png) | bin | 1693 -> 1693 bytes | |||
-rw-r--r-- | res/drawable-sw600dp-mdpi/calculator_input_field.9.png (renamed from res/drawable-xlarge-mdpi/calculator_input_field.9.png) | bin | 1262 -> 1262 bytes | |||
-rw-r--r-- | res/layout-sw600dp-land/main.xml (renamed from res/layout-xlarge-land/main.xml) | 15 | ||||
-rw-r--r-- | res/layout-sw600dp/main.xml (renamed from res/layout-xlarge/main.xml) | 14 | ||||
-rw-r--r-- | res/values-sw600dp-port/styles.xml | 18 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml (renamed from res/values-xlarge/styles.xml) | 4 | ||||
-rw-r--r-- | res/values-sw800dp-land/styles.xml | 20 | ||||
-rw-r--r-- | res/values-sw800dp-port/styles.xml | 20 | ||||
-rw-r--r-- | res/values/styles.xml | 7 |
11 files changed, 83 insertions, 15 deletions
diff --git a/res/drawable-xlarge-hdpi/calc_clear_symbol.png b/res/drawable-sw600dp-hdpi/calc_clear_symbol.png Binary files differindex 8ffc30e..8ffc30e 100644 --- a/res/drawable-xlarge-hdpi/calc_clear_symbol.png +++ b/res/drawable-sw600dp-hdpi/calc_clear_symbol.png diff --git a/res/drawable-xlarge-hdpi/calculator_input_field.9.png b/res/drawable-sw600dp-hdpi/calculator_input_field.9.png Binary files differindex 555873c..555873c 100644 --- a/res/drawable-xlarge-hdpi/calculator_input_field.9.png +++ b/res/drawable-sw600dp-hdpi/calculator_input_field.9.png diff --git a/res/drawable-xlarge-mdpi/calc_clear_symbol.png b/res/drawable-sw600dp-mdpi/calc_clear_symbol.png Binary files differindex 60dfecc..60dfecc 100644 --- a/res/drawable-xlarge-mdpi/calc_clear_symbol.png +++ b/res/drawable-sw600dp-mdpi/calc_clear_symbol.png diff --git a/res/drawable-xlarge-mdpi/calculator_input_field.9.png b/res/drawable-sw600dp-mdpi/calculator_input_field.9.png Binary files differindex 679d4c8..679d4c8 100644 --- a/res/drawable-xlarge-mdpi/calculator_input_field.9.png +++ b/res/drawable-sw600dp-mdpi/calculator_input_field.9.png diff --git a/res/layout-xlarge-land/main.xml b/res/layout-sw600dp-land/main.xml index 9e21630..020edba 100644 --- a/res/layout-xlarge-land/main.xml +++ b/res/layout-sw600dp-land/main.xml @@ -22,15 +22,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#ff000000" - android:paddingLeft="48dip" - android:paddingRight="48dip" - android:paddingTop="48dip" - android:paddingBottom="48dip"> + android:paddingLeft="@dimen/left_right_padding" + android:paddingRight="@dimen/left_right_padding" + android:paddingTop="@dimen/top_bottom_padding" + android:paddingBottom="@dimen/top_bottom_padding"> + <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:layout_marginBottom="48dip" + android:layout_marginBottom="@dimen/group_padding" android:background="@drawable/calculator_input_field"> <com.android.calculator2.CalculatorDisplay @@ -49,7 +50,7 @@ </com.android.calculator2.CalculatorDisplay> <FrameLayout - android:layout_width="160dip" + android:layout_width="100dip" android:layout_height="match_parent"> <Button android:id="@+id/clear" @@ -81,7 +82,7 @@ android:layout_height="match_parent" android:layout_weight="2" android:orientation="vertical" - android:layout_marginRight="64dip"> + android:layout_marginRight="@dimen/group_padding"> <LinearLayout style="@style/btn_row_style"> <Button diff --git a/res/layout-xlarge/main.xml b/res/layout-sw600dp/main.xml index e4ba64b..ccba54a 100644 --- a/res/layout-xlarge/main.xml +++ b/res/layout-sw600dp/main.xml @@ -23,15 +23,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#ff000000" - android:paddingLeft="32dip" - android:paddingRight="32dip" - android:paddingTop="64dip" - android:paddingBottom="64dip"> + android:paddingLeft="@dimen/left_right_padding" + android:paddingRight="@dimen/left_right_padding" + android:paddingTop="@dimen/top_bottom_padding" + android:paddingBottom="@dimen/top_bottom_padding"> <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:layout_marginBottom="72dip" + android:layout_marginBottom="@dimen/group_padding" android:background="@drawable/calculator_input_field"> <com.android.calculator2.CalculatorDisplay @@ -50,7 +50,7 @@ </com.android.calculator2.CalculatorDisplay> <FrameLayout - android:layout_width="160dip" + android:layout_width="100dip" android:layout_height="match_parent"> <Button android:id="@+id/clear" @@ -76,7 +76,7 @@ android:layout_height="0dip" android:layout_weight="2" android:orientation="vertical" - android:layout_marginBottom="72dip"> + android:layout_marginBottom="@dimen/group_padding"> <LinearLayout style="@style/btn_row_style"> diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml new file mode 100644 index 0000000..799f6fe --- /dev/null +++ b/res/values-sw600dp-port/styles.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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> + <dimen name="group_padding">48sp</dimen> +</resources> diff --git a/res/values-xlarge/styles.xml b/res/values-sw600dp/styles.xml index 9dd6b4e..7a946a6 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -19,4 +19,8 @@ <dimen name="btn_function_text_size">32sp</dimen> <dimen name="btn_clear_text_size">48sp</dimen> <dimen name="display_text_size">72sp</dimen> + + <dimen name="left_right_padding">16sp</dimen> + <dimen name="top_bottom_padding">16sp</dimen> + <dimen name="group_padding">16sp</dimen> </resources> diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw800dp-land/styles.xml new file mode 100644 index 0000000..9d1c26c --- /dev/null +++ b/res/values-sw800dp-land/styles.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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> + <dimen name="left_right_padding">48sp</dimen> + <dimen name="top_bottom_padding">48sp</dimen> + <dimen name="group_padding">48sp</dimen> +</resources> diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml new file mode 100644 index 0000000..a6b181e --- /dev/null +++ b/res/values-sw800dp-port/styles.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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> + <dimen name="left_right_padding">32sp</dimen> + <dimen name="top_bottom_padding">64sp</dimen> + <dimen name="group_padding">72sp</dimen> +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index b41cb07..29b7432 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -48,7 +48,10 @@ <item name="android:scrollHorizontally">true</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> - <item name="android:padding">8dp</item> + <item name="android:paddingTop">8dp</item> + <item name="android:paddingLeft">8dp</item> + <item name="android:paddingRight">8dp</item> + <item name="android:paddingBottom">0dp</item> </style> <style name="btn_row_style"> @@ -70,6 +73,7 @@ <item name="android:layout_width">0dip</item> <item name="android:layout_weight">1</item> <item name="android:layout_height">match_parent</item> + <item name="android:gravity">center</item> <item name="android:background">@drawable/btn_function</item> <item name="android:textSize">@dimen/btn_operation_text_size</item> </style> @@ -78,6 +82,7 @@ <item name="android:layout_width">0dip</item> <item name="android:layout_weight">1</item> <item name="android:layout_height">match_parent</item> + <item name="android:gravity">center</item> <item name="android:background">@drawable/btn_digit</item> <item name="android:textSize">@dimen/btn_digit_text_size</item> </style> |