diff options
author | Annie Chin <afchin@google.com> | 2016-06-09 17:50:51 -0700 |
---|---|---|
committer | Annie Chin <afchin@google.com> | 2016-06-13 12:26:40 -0700 |
commit | 28589dc59b81a6ea18fda9d23e36dc412f09df58 (patch) | |
tree | 313915f01e58abe89fe625b1d743eff7d790f53b | |
parent | 79f273c2b38e4e0acda4be111dfdd0b54d150014 (diff) | |
download | android_packages_apps_ExactCalculator-28589dc59b81a6ea18fda9d23e36dc412f09df58.tar.gz android_packages_apps_ExactCalculator-28589dc59b81a6ea18fda9d23e36dc412f09df58.tar.bz2 android_packages_apps_ExactCalculator-28589dc59b81a6ea18fda9d23e36dc412f09df58.zip |
Calculator multiwindow support R3.
Bug: 27839606
Bug: 29247633
Bug: 29234784
Bug: 29229453
Change-Id: Ie27efe4a24b81a00762eee15fbfc035253f8e3c9
-rw-r--r-- | res/layout/pad_advanced_2x8.xml | 207 | ||||
-rw-r--r-- | res/layout/pad_advanced_3x5.xml | 98 | ||||
-rw-r--r-- | res/layout/pad_advanced_5x3.xml | 98 | ||||
-rw-r--r-- | res/values-w230dp-h220dp/layout.xml | 2 | ||||
-rw-r--r-- | res/values-w230dp-h220dp/styles.xml | 12 | ||||
-rw-r--r-- | res/values-w230dp-h275dp/layout.xml (renamed from res/values-w320dp-h569dp/layout.xml) | 2 | ||||
-rw-r--r-- | res/values-w230dp-h275dp/styles.xml (renamed from res/values-w384dp-h386dp/styles.xml) | 19 | ||||
-rw-r--r-- | res/values-w230dp-h569dp/layout.xml (renamed from res/values-w384dp-h386dp/layout.xml) | 4 | ||||
-rw-r--r-- | res/values-w230dp-h569dp/styles.xml | 85 | ||||
-rw-r--r-- | res/values-w396dp-h220dp/layout.xml (renamed from res/values-w384dp-h294dp/layout.xml) | 0 | ||||
-rw-r--r-- | res/values-w396dp-h220dp/styles.xml (renamed from res/values-w384dp-h294dp/styles.xml) | 4 | ||||
-rw-r--r-- | res/values-w396dp-h275dp/layout.xml (renamed from res/values-w450dp-h600dp/layout.xml) | 2 | ||||
-rw-r--r-- | res/values-w396dp-h275dp/styles.xml (renamed from res/values-w240dp-h320dp/styles.xml) | 8 | ||||
-rw-r--r-- | res/values-w396dp-h569dp/layout.xml | 23 | ||||
-rw-r--r-- | res/values-w396dp-h569dp/styles.xml (renamed from res/values-w320dp-h569dp/styles.xml) | 5 | ||||
-rw-r--r-- | res/values-w396dp-h768dp/layout.xml (renamed from res/values-w768dp-h900dp/layout.xml) | 2 | ||||
-rw-r--r-- | res/values-w396dp-h768dp/styles.xml (renamed from res/values-w768dp-h900dp/styles.xml) | 20 | ||||
-rw-r--r-- | res/values-w520dp-h220dp/layout.xml (renamed from res/values-w240dp-h320dp/layout.xml) | 6 | ||||
-rw-r--r-- | res/values-w520dp-h220dp/styles.xml (renamed from res/values-w569dp-h320dp/styles.xml) | 5 | ||||
-rw-r--r-- | res/values-w520dp-h275dp/layout.xml (renamed from res/values-w600dp-h466dp/layout.xml) | 0 | ||||
-rw-r--r-- | res/values-w520dp-h275dp/styles.xml (renamed from res/values-w600dp-h466dp/styles.xml) | 14 | ||||
-rw-r--r-- | res/values-w520dp-h569dp/layout.xml (renamed from res/values-w569dp-h320dp/layout.xml) | 2 | ||||
-rw-r--r-- | res/values-w520dp-h569dp/styles.xml (renamed from res/values-w450dp-h600dp/styles.xml) | 45 | ||||
-rw-r--r-- | res/values-w520dp-h768dp-land/layout.xml (renamed from res/values-w600dp-h614dp/layout.xml) | 2 | ||||
-rw-r--r-- | res/values-w520dp-h768dp-land/styles.xml (renamed from res/values-w600dp-h614dp/styles.xml) | 12 | ||||
-rw-r--r-- | res/values-w520dp-h768dp-port/layout.xml (renamed from res/values-w960dp-h600dp/layout.xml) | 4 | ||||
-rw-r--r-- | res/values-w520dp-h768dp-port/styles.xml (renamed from res/values-w960dp-h600dp/styles.xml) | 60 | ||||
-rw-r--r-- | res/values/styles.xml | 3 | ||||
-rw-r--r-- | src/com/android/calculator2/Calculator.java | 8 |
29 files changed, 327 insertions, 425 deletions
diff --git a/res/layout/pad_advanced_2x8.xml b/res/layout/pad_advanced_2x8.xml deleted file mode 100644 index 52fbeeb..0000000 --- a/res/layout/pad_advanced_2x8.xml +++ /dev/null @@ -1,207 +0,0 @@ -<?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. - --> - -<GridLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pad_advanced" - style="@style/PadLayoutStyle.Advanced" - android:rowCount="2" - android:columnCount="8" - android:background="@color/pad_advanced_background_color"> - - <Button - android:id="@+id/toggle_inv" - style="@style/PadButtonStyle.Advanced.Text" - android:layout_row="0" - android:layout_column="0" - android:background="@drawable/pad_button_inverse_background" - android:contentDescription="@string/desc_inv_off" - android:text="@string/inv" /> - - <Button - android:id="@+id/toggle_mode" - style="@style/PadButtonStyle.Advanced.Text" - android:layout_row="0" - android:layout_column="1" - android:contentDescription="@string/desc_switch_deg" - android:text="@string/mode_deg" /> - - <Button - android:id="@+id/fun_sin" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="2" - android:contentDescription="@string/desc_fun_sin" - android:text="@string/fun_sin" /> - - <Button - android:id="@+id/fun_arcsin" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="2" - android:contentDescription="@string/desc_fun_arcsin" - android:fontFamily="sans-serif-medium" - android:text="@string/fun_arcsin" - android:visibility="gone" /> - - <Button - android:id="@+id/fun_cos" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="3" - android:contentDescription="@string/desc_fun_cos" - android:text="@string/fun_cos" /> - - <Button - android:id="@+id/fun_arccos" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="3" - android:contentDescription="@string/desc_fun_arccos" - android:fontFamily="sans-serif-medium" - android:text="@string/fun_arccos" - android:visibility="gone" /> - - <Button - android:id="@+id/fun_tan" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="4" - android:contentDescription="@string/desc_fun_tan" - android:text="@string/fun_tan" /> - - <Button - android:id="@+id/fun_arctan" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="4" - android:contentDescription="@string/desc_fun_arctan" - android:fontFamily="sans-serif-medium" - android:text="@string/fun_arctan" - android:visibility="gone" /> - - <Button - android:id="@+id/lparen" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="5" - android:contentDescription="@string/desc_lparen" - android:text="@string/lparen" /> - - <Button - android:id="@+id/rparen" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="6" - android:contentDescription="@string/desc_rparen" - android:text="@string/rparen" /> - - <Button - android:id="@+id/op_sqrt" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="7" - android:contentDescription="@string/desc_op_sqrt" - android:text="@string/op_sqrt" /> - - <Button - android:id="@+id/op_sqr" - style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="7" - android:contentDescription="@string/desc_op_sqr" - android:fontFamily="sans-serif-medium" - android:text="@string/op_sqr" - android:visibility="gone" /> - - <Button - android:id="@+id/op_pct" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="0" - android:contentDescription="@string/desc_op_pct" - android:text="@string/op_pct" /> - - <Button - android:id="@+id/fun_ln" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" - android:contentDescription="@string/desc_fun_ln" - android:text="@string/fun_ln" /> - - <Button - android:id="@+id/fun_exp" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" - android:contentDescription="@string/desc_fun_exp" - android:fontFamily="sans-serif-medium" - android:text="@string/fun_exp" - android:visibility="gone" /> - - <Button - android:id="@+id/fun_log" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" - android:contentDescription="@string/desc_fun_log" - android:text="@string/fun_log" /> - - <Button - android:id="@+id/fun_10pow" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" - android:contentDescription="@string/desc_fun_10pow" - android:fontFamily="sans-serif-medium" - android:text="@string/fun_10pow" - android:visibility="gone" /> - - <Button - android:id="@+id/op_fact" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="3" - android:contentDescription="@string/desc_op_fact" - android:text="@string/op_fact" /> - - <Button - android:id="@+id/op_pow" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="4" - android:contentDescription="@string/desc_op_pow" - android:text="@string/op_pow" /> - - <Button - android:id="@+id/const_pi" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="5" - android:contentDescription="@string/desc_const_pi" - android:text="@string/const_pi" /> - - <Button - android:id="@+id/const_e" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="6" - android:contentDescription="@string/desc_const_e" - android:text="@string/const_e" /> - -</GridLayout>
\ No newline at end of file diff --git a/res/layout/pad_advanced_3x5.xml b/res/layout/pad_advanced_3x5.xml index b8de7fd..e303133 100644 --- a/res/layout/pad_advanced_3x5.xml +++ b/res/layout/pad_advanced_3x5.xml @@ -19,8 +19,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pad_advanced" style="@style/PadLayoutStyle.Advanced" - android:rowCount="3" - android:columnCount="5" + android:rowCount="5" + android:columnCount="3" android:background="@color/pad_advanced_background_color"> <Button @@ -41,18 +41,26 @@ android:text="@string/mode_deg" /> <Button - android:id="@+id/fun_sin" + android:id="@+id/op_pct" style="@style/PadButtonStyle.Advanced" android:layout_row="0" android:layout_column="2" + android:contentDescription="@string/desc_op_pct" + android:text="@string/op_pct" /> + + <Button + android:id="@+id/fun_sin" + style="@style/PadButtonStyle.Advanced" + android:layout_row="1" + android:layout_column="0" android:contentDescription="@string/desc_fun_sin" android:text="@string/fun_sin" /> <Button android:id="@+id/fun_arcsin" style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="2" + android:layout_row="1" + android:layout_column="0" android:contentDescription="@string/desc_fun_arcsin" android:fontFamily="sans-serif-medium" android:text="@string/fun_arcsin" @@ -61,16 +69,16 @@ <Button android:id="@+id/fun_cos" style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="3" + android:layout_row="1" + android:layout_column="1" android:contentDescription="@string/desc_fun_cos" android:text="@string/fun_cos" /> <Button android:id="@+id/fun_arccos" style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="3" + android:layout_row="1" + android:layout_column="1" android:contentDescription="@string/desc_fun_arccos" android:fontFamily="sans-serif-medium" android:text="@string/fun_arccos" @@ -79,42 +87,34 @@ <Button android:id="@+id/fun_tan" style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="4" + android:layout_row="1" + android:layout_column="2" android:contentDescription="@string/desc_fun_tan" android:text="@string/fun_tan" /> <Button android:id="@+id/fun_arctan" style="@style/PadButtonStyle.Advanced" - android:layout_row="0" - android:layout_column="4" + android:layout_row="1" + android:layout_column="2" android:contentDescription="@string/desc_fun_arctan" android:fontFamily="sans-serif-medium" android:text="@string/fun_arctan" android:visibility="gone" /> <Button - android:id="@+id/op_pct" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="0" - android:contentDescription="@string/desc_op_pct" - android:text="@string/op_pct" /> - - <Button android:id="@+id/fun_ln" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" + android:layout_row="2" + android:layout_column="0" android:contentDescription="@string/desc_fun_ln" android:text="@string/fun_ln" /> <Button android:id="@+id/fun_exp" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" + android:layout_row="2" + android:layout_column="0" android:contentDescription="@string/desc_fun_exp" android:fontFamily="sans-serif-medium" android:text="@string/fun_exp" @@ -123,16 +123,16 @@ <Button android:id="@+id/fun_log" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" + android:layout_row="2" + android:layout_column="1" android:contentDescription="@string/desc_fun_log" android:text="@string/fun_log" /> <Button android:id="@+id/fun_10pow" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" + android:layout_row="2" + android:layout_column="1" android:contentDescription="@string/desc_fun_10pow" android:fontFamily="sans-serif-medium" android:text="@string/fun_10pow" @@ -141,23 +141,15 @@ <Button android:id="@+id/op_fact" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="3" + android:layout_row="2" + android:layout_column="2" android:contentDescription="@string/desc_op_fact" android:text="@string/op_fact" /> <Button - android:id="@+id/op_pow" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="4" - android:contentDescription="@string/desc_op_pow" - android:text="@string/op_pow" /> - - <Button android:id="@+id/const_pi" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" + android:layout_row="3" android:layout_column="0" android:contentDescription="@string/desc_const_pi" android:text="@string/const_pi" /> @@ -165,40 +157,48 @@ <Button android:id="@+id/const_e" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" + android:layout_row="3" android:layout_column="1" android:contentDescription="@string/desc_const_e" android:text="@string/const_e" /> <Button - android:id="@+id/lparen" + android:id="@+id/op_pow" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" + android:layout_row="3" android:layout_column="2" + android:contentDescription="@string/desc_op_pow" + android:text="@string/op_pow" /> + + <Button + android:id="@+id/lparen" + style="@style/PadButtonStyle.Advanced" + android:layout_row="4" + android:layout_column="0" android:contentDescription="@string/desc_lparen" android:text="@string/lparen" /> <Button android:id="@+id/rparen" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="3" + android:layout_row="4" + android:layout_column="1" android:contentDescription="@string/desc_rparen" android:text="@string/rparen" /> <Button android:id="@+id/op_sqrt" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="4" + android:layout_row="4" + android:layout_column="2" android:contentDescription="@string/desc_op_sqrt" android:text="@string/op_sqrt" /> <Button android:id="@+id/op_sqr" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="4" + android:layout_row="4" + android:layout_column="2" android:contentDescription="@string/desc_op_sqr" android:fontFamily="sans-serif-medium" android:text="@string/op_sqr" diff --git a/res/layout/pad_advanced_5x3.xml b/res/layout/pad_advanced_5x3.xml index e303133..b8de7fd 100644 --- a/res/layout/pad_advanced_5x3.xml +++ b/res/layout/pad_advanced_5x3.xml @@ -19,8 +19,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pad_advanced" style="@style/PadLayoutStyle.Advanced" - android:rowCount="5" - android:columnCount="3" + android:rowCount="3" + android:columnCount="5" android:background="@color/pad_advanced_background_color"> <Button @@ -41,26 +41,18 @@ android:text="@string/mode_deg" /> <Button - android:id="@+id/op_pct" + android:id="@+id/fun_sin" style="@style/PadButtonStyle.Advanced" android:layout_row="0" android:layout_column="2" - android:contentDescription="@string/desc_op_pct" - android:text="@string/op_pct" /> - - <Button - android:id="@+id/fun_sin" - style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="0" android:contentDescription="@string/desc_fun_sin" android:text="@string/fun_sin" /> <Button android:id="@+id/fun_arcsin" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="0" + android:layout_row="0" + android:layout_column="2" android:contentDescription="@string/desc_fun_arcsin" android:fontFamily="sans-serif-medium" android:text="@string/fun_arcsin" @@ -69,16 +61,16 @@ <Button android:id="@+id/fun_cos" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" + android:layout_row="0" + android:layout_column="3" android:contentDescription="@string/desc_fun_cos" android:text="@string/fun_cos" /> <Button android:id="@+id/fun_arccos" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" + android:layout_row="0" + android:layout_column="3" android:contentDescription="@string/desc_fun_arccos" android:fontFamily="sans-serif-medium" android:text="@string/fun_arccos" @@ -87,34 +79,42 @@ <Button android:id="@+id/fun_tan" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" + android:layout_row="0" + android:layout_column="4" android:contentDescription="@string/desc_fun_tan" android:text="@string/fun_tan" /> <Button android:id="@+id/fun_arctan" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" + android:layout_row="0" + android:layout_column="4" android:contentDescription="@string/desc_fun_arctan" android:fontFamily="sans-serif-medium" android:text="@string/fun_arctan" android:visibility="gone" /> <Button - android:id="@+id/fun_ln" + android:id="@+id/op_pct" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" + android:layout_row="1" android:layout_column="0" + android:contentDescription="@string/desc_op_pct" + android:text="@string/op_pct" /> + + <Button + android:id="@+id/fun_ln" + style="@style/PadButtonStyle.Advanced" + android:layout_row="1" + android:layout_column="1" android:contentDescription="@string/desc_fun_ln" android:text="@string/fun_ln" /> <Button android:id="@+id/fun_exp" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="0" + android:layout_row="1" + android:layout_column="1" android:contentDescription="@string/desc_fun_exp" android:fontFamily="sans-serif-medium" android:text="@string/fun_exp" @@ -123,16 +123,16 @@ <Button android:id="@+id/fun_log" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="1" + android:layout_row="1" + android:layout_column="2" android:contentDescription="@string/desc_fun_log" android:text="@string/fun_log" /> <Button android:id="@+id/fun_10pow" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="1" + android:layout_row="1" + android:layout_column="2" android:contentDescription="@string/desc_fun_10pow" android:fontFamily="sans-serif-medium" android:text="@string/fun_10pow" @@ -141,15 +141,23 @@ <Button android:id="@+id/op_fact" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="2" + android:layout_row="1" + android:layout_column="3" android:contentDescription="@string/desc_op_fact" android:text="@string/op_fact" /> <Button + android:id="@+id/op_pow" + style="@style/PadButtonStyle.Advanced" + android:layout_row="1" + android:layout_column="4" + android:contentDescription="@string/desc_op_pow" + android:text="@string/op_pow" /> + + <Button android:id="@+id/const_pi" style="@style/PadButtonStyle.Advanced" - android:layout_row="3" + android:layout_row="2" android:layout_column="0" android:contentDescription="@string/desc_const_pi" android:text="@string/const_pi" /> @@ -157,48 +165,40 @@ <Button android:id="@+id/const_e" style="@style/PadButtonStyle.Advanced" - android:layout_row="3" + android:layout_row="2" android:layout_column="1" android:contentDescription="@string/desc_const_e" android:text="@string/const_e" /> <Button - android:id="@+id/op_pow" - style="@style/PadButtonStyle.Advanced" - android:layout_row="3" - android:layout_column="2" - android:contentDescription="@string/desc_op_pow" - android:text="@string/op_pow" /> - - <Button android:id="@+id/lparen" style="@style/PadButtonStyle.Advanced" - android:layout_row="4" - android:layout_column="0" + android:layout_row="2" + android:layout_column="2" android:contentDescription="@string/desc_lparen" android:text="@string/lparen" /> <Button android:id="@+id/rparen" style="@style/PadButtonStyle.Advanced" - android:layout_row="4" - android:layout_column="1" + android:layout_row="2" + android:layout_column="3" android:contentDescription="@string/desc_rparen" android:text="@string/rparen" /> <Button android:id="@+id/op_sqrt" style="@style/PadButtonStyle.Advanced" - android:layout_row="4" - android:layout_column="2" + android:layout_row="2" + android:layout_column="4" android:contentDescription="@string/desc_op_sqrt" android:text="@string/op_sqrt" /> <Button android:id="@+id/op_sqr" style="@style/PadButtonStyle.Advanced" - android:layout_row="4" - android:layout_column="2" + android:layout_row="2" + android:layout_column="4" android:contentDescription="@string/desc_op_sqr" android:fontFamily="sans-serif-medium" android:text="@string/op_sqr" diff --git a/res/values-w230dp-h220dp/layout.xml b/res/values-w230dp-h220dp/layout.xml index acde77e..23e7c36 100644 --- a/res/values-w230dp-h220dp/layout.xml +++ b/res/values-w230dp-h220dp/layout.xml @@ -18,6 +18,6 @@ <resources> <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item> <item name="display" type="layout">@layout/display_one_line</item> - <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> + <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item> <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item> </resources>
\ No newline at end of file diff --git a/res/values-w230dp-h220dp/styles.xml b/res/values-w230dp-h220dp/styles.xml index aa83d0c..20c2967 100644 --- a/res/values-w230dp-h220dp/styles.xml +++ b/res/values-w230dp-h220dp/styles.xml @@ -35,13 +35,12 @@ <item name="android:paddingEnd">16dip</item> <item name="android:gravity">bottom</item> <item name="android:textSize">40dip</item> - <item name="android:visibility">invisible</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">20sp</item> + <item name="android:textSize">20dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> @@ -72,7 +71,7 @@ <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">1</item> + <item name="android:layout_weight">264</item> <item name="android:layout_height">match_parent</item> <item name="android:paddingTop">12dip</item> <item name="android:paddingBottom">20dip</item> @@ -81,17 +80,16 @@ </style> <style name="PadButtonStyle.Numeric.Equals"> - <item name="android:visibility">gone</item> + <item name="android:visibility">visible</item> </style> <style name="PadLayoutStyle.Operator"> <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:layout_weight">96</item> <item name="android:paddingTop">8dip</item> <item name="android:paddingBottom">24dip</item> <item name="android:paddingStart">4dip</item> <item name="android:paddingEnd">28dip</item> </style> -</resources> +</resources>
\ No newline at end of file diff --git a/res/values-w320dp-h569dp/layout.xml b/res/values-w230dp-h275dp/layout.xml index be6eda2..3e97b80 100644 --- a/res/values-w320dp-h569dp/layout.xml +++ b/res/values-w230dp-h275dp/layout.xml @@ -19,5 +19,5 @@ <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item> <item name="display" type="layout">@layout/display_two_line</item> <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item> - <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item> </resources>
\ No newline at end of file diff --git a/res/values-w384dp-h386dp/styles.xml b/res/values-w230dp-h275dp/styles.xml index 09fde1f..de1705e 100644 --- a/res/values-w384dp-h386dp/styles.xml +++ b/res/values-w230dp-h275dp/styles.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2014 The Android Open Source Project + 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. @@ -22,7 +22,8 @@ <item name="android:paddingBottom">0dip</item> <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> - <item name="minTextSize">32dip</item> + <item name="android:gravity">bottom</item> + <item name="minTextSize">40dip</item> <item name="maxTextSize">40dip</item> <item name="stepTextSize">8dip</item> </style> @@ -32,7 +33,8 @@ <item name="android:paddingBottom">0dip</item> <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> - <item name="android:textSize">24dip</item> + <item name="android:gravity">bottom</item> + <item name="android:textSize">40dip</item> </style> <style name="PadButtonStyle.Advanced"> @@ -47,7 +49,7 @@ </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">22dip</item> + <item name="android:textSize">26dip</item> </style> <style name="PadButtonStyle.Operator"> @@ -69,8 +71,8 @@ <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> + <item name="android:layout_weight">264</item> <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">1</item> <item name="android:paddingTop">12dip</item> <item name="android:paddingBottom">20dip</item> <item name="android:paddingStart">12dip</item> @@ -78,17 +80,16 @@ </style> <style name="PadButtonStyle.Numeric.Equals"> - <item name="android:visibility">gone</item> + <item name="android:visibility">visible</item> </style> <style name="PadLayoutStyle.Operator"> <item name="android:layout_width">0dip</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">1</item> + <item name="android:layout_weight">96</item> <item name="android:paddingTop">8dip</item> <item name="android:paddingBottom">24dip</item> <item name="android:paddingStart">4dip</item> <item name="android:paddingEnd">28dip</item> </style> -</resources> +</resources>
\ No newline at end of file diff --git a/res/values-w384dp-h386dp/layout.xml b/res/values-w230dp-h569dp/layout.xml index f02b3f0..d9db1f0 100644 --- a/res/values-w384dp-h386dp/layout.xml +++ b/res/values-w230dp-h569dp/layout.xml @@ -18,6 +18,6 @@ <resources> <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item> <item name="display" type="layout">@layout/display_two_line</item> - <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> - <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item> + <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item> </resources>
\ No newline at end of file diff --git a/res/values-w230dp-h569dp/styles.xml b/res/values-w230dp-h569dp/styles.xml new file mode 100644 index 0000000..9cdb455 --- /dev/null +++ b/res/values-w230dp-h569dp/styles.xml @@ -0,0 +1,85 @@ +<?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 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> + <item name="android:textSize">23dip</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">20dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">36dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">visible</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">27dip</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">20dip</item> + </style> + + <style name="PadLayoutStyle.Numeric"> + <item name="android:layout_width">0dip</item> + <item name="android:layout_weight">264</item> + <item name="android:layout_height">match_parent</item> + <item name="android:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">12dip</item> + <item name="android:paddingEnd">12dip</item> + </style> + + <style name="PadLayoutStyle.Operator"> + <item name="android:layout_width">0dip</item> + <item name="android:layout_weight">96</item> + <item name="android:paddingTop">8dip</item> + <item name="android:paddingBottom">24dip</item> + <item name="android:paddingStart">4dip</item> + <item name="android:paddingEnd">28dip</item> + </style> + +</resources>
\ No newline at end of file diff --git a/res/values-w384dp-h294dp/layout.xml b/res/values-w396dp-h220dp/layout.xml index acde77e..acde77e 100644 --- a/res/values-w384dp-h294dp/layout.xml +++ b/res/values-w396dp-h220dp/layout.xml diff --git a/res/values-w384dp-h294dp/styles.xml b/res/values-w396dp-h220dp/styles.xml index dfc53ba..6434da8 100644 --- a/res/values-w384dp-h294dp/styles.xml +++ b/res/values-w396dp-h220dp/styles.xml @@ -23,7 +23,7 @@ <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> <item name="android:gravity">bottom</item> - <item name="minTextSize">40dip</item> + <item name="minTextSize">4dip</item> <item name="maxTextSize">40dip</item> <item name="stepTextSize">8dip</item> </style> @@ -72,7 +72,6 @@ <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> - <item name="android:layout_height">match_parent</item> <item name="android:layout_weight">1</item> <item name="android:paddingTop">12dip</item> <item name="android:paddingBottom">20dip</item> @@ -86,7 +85,6 @@ <style name="PadLayoutStyle.Operator"> <item name="android:layout_width">0dip</item> - <item name="android:layout_height">match_parent</item> <item name="android:layout_weight">1</item> <item name="android:paddingTop">8dip</item> <item name="android:paddingBottom">24dip</item> diff --git a/res/values-w450dp-h600dp/layout.xml b/res/values-w396dp-h275dp/layout.xml index f02b3f0..3e97b80 100644 --- a/res/values-w450dp-h600dp/layout.xml +++ b/res/values-w396dp-h275dp/layout.xml @@ -18,6 +18,6 @@ <resources> <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item> <item name="display" type="layout">@layout/display_two_line</item> - <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> + <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item> <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item> </resources>
\ No newline at end of file diff --git a/res/values-w240dp-h320dp/styles.xml b/res/values-w396dp-h275dp/styles.xml index a260902..f7371bb 100644 --- a/res/values-w240dp-h320dp/styles.xml +++ b/res/values-w396dp-h275dp/styles.xml @@ -23,7 +23,7 @@ <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> <item name="android:gravity">bottom</item> - <item name="minTextSize">4dip</item> + <item name="minTextSize">40dip</item> <item name="maxTextSize">40dip</item> <item name="stepTextSize">8dip</item> </style> @@ -34,14 +34,13 @@ <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> <item name="android:gravity">bottom</item> - <item name="android:textSize">40sp</item> - <item name="android:visibility">invisible</item> + <item name="android:textSize">40dip</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">20sp</item> + <item name="android:textSize">20dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> @@ -73,6 +72,7 @@ <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> <item name="android:layout_weight">264</item> + <item name="android:layout_height">match_parent</item> <item name="android:paddingTop">12dip</item> <item name="android:paddingBottom">20dip</item> <item name="android:paddingStart">12dip</item> diff --git a/res/values-w396dp-h569dp/layout.xml b/res/values-w396dp-h569dp/layout.xml new file mode 100644 index 0000000..d9db1f0 --- /dev/null +++ b/res/values-w396dp-h569dp/layout.xml @@ -0,0 +1,23 @@ +<?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> + <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item> + <item name="display" type="layout">@layout/display_two_line</item> + <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item> +</resources>
\ No newline at end of file diff --git a/res/values-w320dp-h569dp/styles.xml b/res/values-w396dp-h569dp/styles.xml index e659072..8fde88e 100644 --- a/res/values-w320dp-h569dp/styles.xml +++ b/res/values-w396dp-h569dp/styles.xml @@ -81,9 +81,4 @@ <item name="android:paddingEnd">28dip</item> </style> - <style name="DisplayLayoutStyle"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - </style> - </resources> diff --git a/res/values-w768dp-h900dp/layout.xml b/res/values-w396dp-h768dp/layout.xml index a32c6ba..80633ce 100644 --- a/res/values-w768dp-h900dp/layout.xml +++ b/res/values-w396dp-h768dp/layout.xml @@ -18,6 +18,6 @@ <resources> <item name="activity_calculator" type="layout">@layout/activity_calculator_tablet_port</item> <item name="display" type="layout">@layout/display_two_line</item> - <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item> <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> </resources>
\ No newline at end of file diff --git a/res/values-w768dp-h900dp/styles.xml b/res/values-w396dp-h768dp/styles.xml index 8b74525..893e0c5 100644 --- a/res/values-w768dp-h900dp/styles.xml +++ b/res/values-w396dp-h768dp/styles.xml @@ -22,9 +22,9 @@ <item name="android:paddingBottom">32dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">48sp</item> - <item name="maxTextSize">72sp</item> - <item name="stepTextSize">8sp</item> + <item name="minTextSize">48dip</item> + <item name="maxTextSize">72dip</item> + <item name="stepTextSize">8dip</item> </style> <style name="DisplayTextStyle.Result"> @@ -32,22 +32,22 @@ <item name="android:paddingBottom">48dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">48sp</item> + <item name="android:textSize">4dip</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">27sp</item> + <item name="android:textSize">27dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">24sp</item> + <item name="android:textSize">24dip</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">36sp</item> + <item name="android:textSize">36dip</item> </style> <style name="PadButtonStyle.Numeric.Equals"> @@ -55,12 +55,12 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">36sp</item> + <item name="android:textSize">36dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">24sp</item> + <item name="android:textSize">24dip</item> </style> <style name="PadLayoutStyle.Advanced"> @@ -88,7 +88,7 @@ <item name="android:layout_height">match_parent</item> <item name="android:paddingTop">8dip</item> <item name="android:paddingBottom">8dip</item> - <item name="android:paddingStart">8dip</item> + <item name="android:paddingStart">4dip</item> <item name="android:paddingEnd">8dip</item> </style> diff --git a/res/values-w240dp-h320dp/layout.xml b/res/values-w520dp-h220dp/layout.xml index 4eef111..4f6bda4 100644 --- a/res/values-w240dp-h320dp/layout.xml +++ b/res/values-w520dp-h220dp/layout.xml @@ -16,8 +16,8 @@ --> <resources> - <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item> + <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item> <item name="display" type="layout">@layout/display_one_line</item> - <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item> - <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item> + <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item> </resources>
\ No newline at end of file diff --git a/res/values-w569dp-h320dp/styles.xml b/res/values-w520dp-h220dp/styles.xml index 0a3843c..8e4a770 100644 --- a/res/values-w569dp-h320dp/styles.xml +++ b/res/values-w520dp-h220dp/styles.xml @@ -90,9 +90,4 @@ <item name="android:paddingEnd">12dip</item> </style> - <style name="DisplayLayoutStyle"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - </style> - </resources>
\ No newline at end of file diff --git a/res/values-w600dp-h466dp/layout.xml b/res/values-w520dp-h275dp/layout.xml index cbb2d49..cbb2d49 100644 --- a/res/values-w600dp-h466dp/layout.xml +++ b/res/values-w520dp-h275dp/layout.xml diff --git a/res/values-w600dp-h466dp/styles.xml b/res/values-w520dp-h275dp/styles.xml index 6922663..f758f64 100644 --- a/res/values-w600dp-h466dp/styles.xml +++ b/res/values-w520dp-h275dp/styles.xml @@ -18,12 +18,12 @@ <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:paddingTop">0dip</item> + <item name="android:paddingBottom">0dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">60dip</item> - <item name="maxTextSize">76dip</item> + <item name="minTextSize">24dip</item> + <item name="maxTextSize">32dip</item> <item name="stepTextSize">8dip</item> </style> @@ -32,7 +32,7 @@ <item name="android:paddingBottom">0dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">40dip</item> + <item name="android:textSize">24dip</item> </style> <style name="PadButtonStyle.Advanced"> @@ -47,7 +47,7 @@ </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">38dip</item> + <item name="android:textSize">26dip</item> </style> <style name="PadButtonStyle.Numeric.Equals"> @@ -93,4 +93,4 @@ <item name="android:paddingEnd">16dip</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-w569dp-h320dp/layout.xml b/res/values-w520dp-h569dp/layout.xml index 4df33a6..b1babae 100644 --- a/res/values-w569dp-h320dp/layout.xml +++ b/res/values-w520dp-h569dp/layout.xml @@ -18,6 +18,6 @@ <resources> <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item> <item name="display" type="layout">@layout/display_two_line</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item> <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> - <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item> </resources>
\ No newline at end of file diff --git a/res/values-w450dp-h600dp/styles.xml b/res/values-w520dp-h569dp/styles.xml index b13065f..e9cc37d 100644 --- a/res/values-w450dp-h600dp/styles.xml +++ b/res/values-w520dp-h569dp/styles.xml @@ -15,6 +15,7 @@ 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"> @@ -22,32 +23,32 @@ <item name="android:paddingBottom">32dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">60dip</item> - <item name="maxTextSize">76dip</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">0dip</item> - <item name="android:paddingBottom">0dip</item> + <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">40dip</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> - <item name="android:textSize">18dip</item> + <item name="android:textSize">27dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item>s - <item name="android:textSize">18dip</item> + <item name="android:textSize">24dip</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">38dip</item> + <item name="android:textSize">36dip</item> </style> <style name="PadButtonStyle.Numeric.Equals"> @@ -55,32 +56,42 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">28dip</item> + <item name="android:textSize">36dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">20dip</item> + <item name="android:textSize">24dip</item> + </style> + + <style name="PadLayoutStyle.Operator"> + <item name="android:layout_width">0dip</item> + <item name="android:layout_weight">20</item> + <item name="android:layout_height">match_parent</item> + <item name="android:paddingTop">8dip</item> + <item name="android:paddingBottom">24dip</item> + <item name="android:paddingStart">4dip</item> + <item name="android:paddingEnd">4dip</item> </style> <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">1</item> + <item name="android:layout_weight">40</item> <item name="android:paddingTop">12dip</item> <item name="android:paddingBottom">20dip</item> <item name="android:paddingStart">12dip</item> <item name="android:paddingEnd">12dip</item> </style> - <style name="PadLayoutStyle.Operator"> - <item name="android:layout_width">0dip</item> + <style name="PadLayoutStyle.Advanced"> <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">1</item> + <item name="android:layout_weight">40</item> + <item name="android:layout_width">0dip</item> <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">24dip</item> - <item name="android:paddingStart">4dip</item> - <item name="android:paddingEnd">28dip</item> + <item name="android:paddingBottom">8dip</item> + <item name="android:paddingStart">16dip</item> + <item name="android:paddingEnd">16dip</item> </style> </resources>
\ No newline at end of file diff --git a/res/values-w600dp-h614dp/layout.xml b/res/values-w520dp-h768dp-land/layout.xml index cbb2d49..b1babae 100644 --- a/res/values-w600dp-h614dp/layout.xml +++ b/res/values-w520dp-h768dp-land/layout.xml @@ -18,6 +18,6 @@ <resources> <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item> <item name="display" type="layout">@layout/display_two_line</item> - <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item> + <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item> <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> </resources>
\ No newline at end of file diff --git a/res/values-w600dp-h614dp/styles.xml b/res/values-w520dp-h768dp-land/styles.xml index 2f4fdc7..712a07d 100644 --- a/res/values-w600dp-h614dp/styles.xml +++ b/res/values-w520dp-h768dp-land/styles.xml @@ -23,7 +23,7 @@ <item name="android:paddingBottom">32dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">60dip</item> + <item name="minTextSize">44dip</item> <item name="maxTextSize">76dip</item> <item name="stepTextSize">8dip</item> </style> @@ -33,18 +33,18 @@ <item name="android:paddingBottom">56dip</item> <item name="android:paddingStart">44dip</item> <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">40dip</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> - <item name="android:textSize">18dip</item> + <item name="android:textSize">30dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item>s - <item name="android:textSize">18dip</item> + <item name="android:textSize">26dip</item> </style> <style name="PadButtonStyle.Numeric"> @@ -56,12 +56,12 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">28dip</item> + <item name="android:textSize">36dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">20dip</item> + <item name="android:textSize">26dip</item> </style> <style name="PadLayoutStyle.Operator"> diff --git a/res/values-w960dp-h600dp/layout.xml b/res/values-w520dp-h768dp-port/layout.xml index 4df33a6..80633ce 100644 --- a/res/values-w960dp-h600dp/layout.xml +++ b/res/values-w520dp-h768dp-port/layout.xml @@ -16,8 +16,8 @@ --> <resources> - <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item> + <item name="activity_calculator" type="layout">@layout/activity_calculator_tablet_port</item> <item name="display" type="layout">@layout/display_two_line</item> - <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item> + <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item> </resources>
\ No newline at end of file diff --git a/res/values-w960dp-h600dp/styles.xml b/res/values-w520dp-h768dp-port/styles.xml index ed8614a..8e1ba60 100644 --- a/res/values-w960dp-h600dp/styles.xml +++ b/res/values-w520dp-h768dp-port/styles.xml @@ -18,32 +18,32 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">24dip</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="minTextSize">60dip</item> - <item name="maxTextSize">76dip</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">24dip</item> - <item name="android:paddingBottom">56dip</item> + <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">40dip</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> - <item name="android:textSize">18dip</item> + <item name="android:textSize">32dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item>s - <item name="android:textSize">18dip</item> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">28dip</item> </style> <style name="PadButtonStyle.Numeric"> @@ -55,39 +55,41 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">28dip</item> + <item name="android:textSize">38dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">20dip</item> + <item name="android:textSize">28dip</item> + </style> + + <style name="PadLayoutStyle.Advanced"> + <item name="android:layout_height">0dip</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> + <item name="android:paddingEnd">16dip</item> </style> <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</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">18dip</item> + <item name="android:layout_height">match_parent</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">280</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> - </style> - - <style name="PadLayoutStyle.Advanced"> - <item name="android:layout_width">0dip</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">18dip</item> + <item name="android:layout_weight">264</item> + <item name="android:layout_height">match_parent</item> + <item name="android:paddingTop">8dip</item> + <item name="android:paddingBottom">8dip</item> + <item name="android:paddingStart">8dip</item> + <item name="android:paddingEnd">8dip</item> </style> <style name="DisplayLayoutStyle"> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2a29c04..883aee6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -68,8 +68,7 @@ <style name="DisplayLayoutStyle"> <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">0dip</item> - <item name="android:layout_weight">1</item> + <item name="android:layout_height">wrap_content</item> </style> </resources> diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java index 30a2785..f51f3fb 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -920,13 +920,15 @@ public class Calculator extends Activity // Calculate the necessary translations so the result takes the place of the formula and // the formula moves off the top of the screen. + final float resultTranslationY = (mFormulaContainer.getBottom() - mResultText.getBottom()) + - (mFormulaText.getPaddingBottom() - mResultText.getPaddingBottom()); + float formulaTranslationY = -mFormulaContainer.getBottom(); if (mOneLine) { // Position the result text. mResultText.setY(mResultText.getBottom()); + formulaTranslationY = -(findViewById(R.id.toolbar).getBottom() + + mFormulaContainer.getBottom()); } - final float resultTranslationY = (mFormulaContainer.getBottom() - mResultText.getBottom()) - - (mFormulaText.getPaddingBottom() - mResultText.getPaddingBottom()); - final float formulaTranslationY = -mFormulaContainer.getBottom(); // Change the result's textColor to match the formula. final int formulaTextColor = mFormulaText.getCurrentTextColor(); |