diff options
| author | Annie Chin <afchin@google.com> | 2016-06-08 00:13:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 00:13:27 +0000 |
| commit | 016a794f7a3f0ed532a64978aeac2392209847cd (patch) | |
| tree | 2d70b37e40d8816bb1cf0b324af60a21fa913feb /res | |
| parent | c44183f34353b6c5051e49e16ccdb4687dd807a8 (diff) | |
| parent | 6d42f1ade3bde822535e75eebf634e6e3cf57efb (diff) | |
| download | android_packages_apps_ExactCalculator-016a794f7a3f0ed532a64978aeac2392209847cd.tar.gz android_packages_apps_ExactCalculator-016a794f7a3f0ed532a64978aeac2392209847cd.tar.bz2 android_packages_apps_ExactCalculator-016a794f7a3f0ed532a64978aeac2392209847cd.zip | |
Merge \"Calculator multiwindow support.\" into ub-calculator-calculus
am: 6d42f1ade3
Change-Id: I6d0b5923852894e20989644aa62c332de0ac9968
Diffstat (limited to 'res')
38 files changed, 1387 insertions, 355 deletions
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml index 1fe12db..5dd2c20 100644 --- a/res/layout/activity_calculator_land.xml +++ b/res/layout/activity_calculator_land.xml @@ -32,7 +32,7 @@ android:layout_weight="1"> <include layout="@layout/pad_numeric" /> - <include layout="@layout/pad_operator_two_col" /> + <include layout="@layout/pad_operator" /> <include layout="@layout/pad_advanced" /> </LinearLayout> diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml index 0cb5dc7..0a5a896 100644 --- a/res/layout/activity_calculator_port.xml +++ b/res/layout/activity_calculator_port.xml @@ -21,16 +21,13 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include - layout="@layout/display" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/display"/> <com.android.calculator2.CalculatorPadViewPager android:id="@+id/pad_pager" android:layout_width="match_parent" android:layout_height="0dip" - android:layout_weight="1" + android:layout_weight="2" android:overScrollMode="never"> <LinearLayout @@ -38,7 +35,7 @@ android:layout_height="match_parent"> <include layout="@layout/pad_numeric" /> - <include layout="@layout/pad_operator_one_col" /> + <include layout="@layout/pad_operator" /> </LinearLayout> diff --git a/res/layout/activity_calculator_tablet_port.xml b/res/layout/activity_calculator_tablet_port.xml index b56450e..9eab3af 100644 --- a/res/layout/activity_calculator_tablet_port.xml +++ b/res/layout/activity_calculator_tablet_port.xml @@ -21,17 +21,17 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include - layout="@layout/display" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/display" /> - <include layout="@layout/pad_advanced_tablet_port" /> + <include layout="@layout/pad_advanced" /> - <LinearLayout style="@style/PadLinearLayoutStyle"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="500"> - <include layout="@layout/pad_numeric" /> - <include layout="@layout/pad_operator_two_col" /> + <include layout="@layout/pad_numeric"/> + <include layout="@layout/pad_operator" /> </LinearLayout> diff --git a/res/layout/display_one_line.xml b/res/layout/display_one_line.xml new file mode 100644 index 0000000..4737d4a --- /dev/null +++ b/res/layout/display_one_line.xml @@ -0,0 +1,69 @@ +<?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. + --> + +<com.android.calculator2.CalculatorDisplay + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/display" + style="@style/DisplayLayoutStyle" + android:background="@color/display_background_color" + android:clipChildren="false" + android:elevation="4dip" + android:orientation="vertical"> + + <include layout="@layout/toolbar" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.calculator2.CalculatorScrollView + android:id="@+id/formula_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:overScrollMode="never" + android:scrollbars="none"> + + <com.android.calculator2.CalculatorText + android:id="@+id/formula" + style="@style/DisplayTextStyle.Formula" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="bottom|end" + android:ellipsize="none" + android:gravity="bottom|end" + android:longClickable="true" + android:singleLine="true" + android:textColor="@color/display_formula_text_color" + android:textIsSelectable="false" /> + + </com.android.calculator2.CalculatorScrollView> + + <com.android.calculator2.CalculatorResult + android:id="@+id/result" + style="@style/DisplayTextStyle.Result" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:bufferType="spannable" + android:singleLine="true" + android:textColor="@color/display_result_text_color" + android:visibility="invisible" /> + + </FrameLayout> + +</com.android.calculator2.CalculatorDisplay> diff --git a/res/layout/display.xml b/res/layout/display_two_line.xml index c970b88..5da0720 100644 --- a/res/layout/display.xml +++ b/res/layout/display_two_line.xml @@ -18,31 +18,17 @@ <com.android.calculator2.CalculatorDisplay xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/display" - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/DisplayLayoutStyle" android:background="@color/display_background_color" - android:elevation="4dip"> + android:elevation="4dip" + android:orientation="vertical"> - <Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?android:attr/actionBarSize"> - - <TextView - android:id="@+id/mode" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" - android:textAllCaps="true" - android:textSize="16sp" /> - - </Toolbar> + <include layout="@layout/toolbar" /> <com.android.calculator2.CalculatorScrollView android:id="@+id/formula_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/toolbar" android:overScrollMode="never" android:scrollbars="none"> @@ -65,7 +51,6 @@ style="@style/DisplayTextStyle.Result" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/formula_container" android:bufferType="spannable" android:singleLine="true" android:textColor="@color/display_result_text_color" /> diff --git a/res/layout/pad_advanced_2x8.xml b/res/layout/pad_advanced_2x8.xml new file mode 100644 index 0000000..52fbeeb --- /dev/null +++ b/res/layout/pad_advanced_2x8.xml @@ -0,0 +1,207 @@ +<?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_tablet_port.xml b/res/layout/pad_advanced_3x5.xml index b8de7fd..b8de7fd 100644 --- a/res/layout/pad_advanced_tablet_port.xml +++ b/res/layout/pad_advanced_3x5.xml diff --git a/res/layout/pad_advanced_4x4.xml b/res/layout/pad_advanced_4x4.xml new file mode 100644 index 0000000..ddbee47 --- /dev/null +++ b/res/layout/pad_advanced_4x4.xml @@ -0,0 +1,207 @@ +<?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="4" + android:columnCount="4" + 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/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="1" + android:layout_column="0" + 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="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="1" + android:layout_column="1" + 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="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="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/const_pi" + style="@style/PadButtonStyle.Advanced" + android:layout_row="1" + android:layout_column="3" + android:contentDescription="@string/desc_const_pi" + android:text="@string/const_pi" /> + + <Button + android:id="@+id/fun_ln" + style="@style/PadButtonStyle.Advanced" + 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="2" + android:layout_column="0" + 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="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="2" + android:layout_column="1" + 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="2" + android:layout_column="2" + android:contentDescription="@string/desc_op_fact" + android:text="@string/op_fact" /> + + <Button + android:id="@+id/const_e" + style="@style/PadButtonStyle.Advanced" + android:layout_row="2" + android:layout_column="3" + android:contentDescription="@string/desc_const_e" + android:text="@string/const_e" /> + + <Button + android:id="@+id/lparen" + style="@style/PadButtonStyle.Advanced" + android:layout_row="3" + 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="3" + 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="3" + 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="3" + android:layout_column="2" + android:contentDescription="@string/desc_op_sqr" + android:fontFamily="sans-serif-medium" + android:text="@string/op_sqr" + android:visibility="gone" /> + + <Button + android:id="@+id/op_pow" + style="@style/PadButtonStyle.Advanced" + android:layout_row="3" + android:layout_column="3" + android:contentDescription="@string/desc_op_pow" + android:text="@string/op_pow" /> + +</GridLayout>
\ No newline at end of file diff --git a/res/layout/pad_advanced.xml b/res/layout/pad_advanced_5x3.xml index e303133..e303133 100644 --- a/res/layout/pad_advanced.xml +++ b/res/layout/pad_advanced_5x3.xml diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml new file mode 100644 index 0000000..56f05b6 --- /dev/null +++ b/res/layout/toolbar.xml @@ -0,0 +1,33 @@ +<?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. + --> + +<Toolbar + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?android:attr/actionBarSize" + android:layout_gravity="top"> + + <TextView + android:id="@+id/mode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="sans-serif-medium" + android:textAllCaps="true" + android:textSize="16sp" /> + +</Toolbar>
\ No newline at end of file diff --git a/res/values-sw360dp-long-port/styles.xml b/res/values-sw360dp-long-port/styles.xml deleted file mode 100644 index 93820c7..0000000 --- a/res/values-sw360dp-long-port/styles.xml +++ /dev/null @@ -1,64 +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. - --> - -<!-- Styles for portrait phone with long aspect ratio. --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">28dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="minTextSize">42sp</item> - <item name="maxTextSize">74sp</item> - <item name="stepTextSize">8sp</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">42dip</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:textSize">42sp</item> - </style> - - <style name="PadButtonStyle.Advanced"> - <item name="android:background">@drawable/pad_button_advanced_background</item> - <item name="android:textColor">@color/pad_button_advanced_text_color</item> - <item name="android:textSize">23sp</item> - </style> - - <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">20sp</item> - </style> - - <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">36sp</item> - </style> - - <style name="PadButtonStyle.Operator"> - <item name="android:textSize">27sp</item> - </style> - - <style name="PadButtonStyle.Operator.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">20sp</item> - </style> - -</resources> - diff --git a/res/values-sw400dp-land/styles.xml b/res/values-sw400dp-land/styles.xml deleted file mode 100644 index e37e8a0..0000000 --- a/res/values-sw400dp-land/styles.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- Styles for landscape phone (e.g. Nexus 4/5). --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">2dip</item> - <item name="android:paddingBottom">10dip</item> - <item name="android:paddingStart">36dip</item> - <item name="android:paddingEnd">36dip</item> - <item name="android:textSize">32sp</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">32sp</item> - </style> - - <style name="PadButtonStyle.Advanced"> - <item name="android:background">@drawable/pad_button_advanced_background</item> - <item name="android:textColor">@color/pad_button_advanced_text_color</item> - <item name="android:textSize">17sp</item> - </style> - - <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">15sp</item> - </style> - - <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">27sp</item> - </style> - - <style name="PadButtonStyle.Operator"> - <item name="android:textSize">24sp</item> - </style> - - <style name="PadButtonStyle.Operator.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">15sp</item> - </style> - -</resources> diff --git a/res/values-sw768dp-land/styles.xml b/res/values-sw768dp-land/styles.xml deleted file mode 100644 index 162e5bc..0000000 --- a/res/values-sw768dp-land/styles.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- Styles for landscape 800dip-wide tablet (e.g. Nexus 10). --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">16dip</item> - <item name="android:paddingBottom">32dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">56sp</item> - <item name="maxTextSize">72sp</item> - <item name="stepTextSize">8sp</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">56sp</item> - </style> - - <style name="PadButtonStyle.Advanced"> - <item name="android:background">@drawable/pad_button_advanced_background</item> - <item name="android:textColor">@color/pad_button_advanced_text_color</item> - <item name="android:textSize">30sp</item> - </style> - - <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">26sp</item> - </style> - - <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">36sp</item> - </style> - - <style name="PadButtonStyle.Operator"> - <item name="android:textSize">36sp</item> - </style> - - <style name="PadButtonStyle.Operator.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">26sp</item> - </style> - -</resources> diff --git a/res/values-sw768dp-port/styles.xml b/res/values-sw768dp-port/styles.xml deleted file mode 100644 index c9bceba..0000000 --- a/res/values-sw768dp-port/styles.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- Styles for portrait 800dip-wide tablet (e.g. Nexus 10). --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">24dip</item> - <item name="android:paddingBottom">32dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="minTextSize">56sp</item> - <item name="maxTextSize">80sp</item> - <item name="stepTextSize">8sp</item> - </style> - - <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">24dip</item> - <item name="android:paddingBottom">56dip</item> - <item name="android:paddingStart">44dip</item> - <item name="android:paddingEnd">44dip</item> - <item name="android:textSize">56sp</item> - </style> - - <style name="PadButtonStyle.Advanced"> - <item name="android:background">@drawable/pad_button_advanced_background</item> - <item name="android:textColor">@color/pad_button_advanced_text_color</item> - <item name="android:textSize">32sp</item> - </style> - - <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item>s - <item name="android:textSize">28sp</item> - </style> - - <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">38sp</item> - </style> - - <style name="PadButtonStyle.Operator"> - <item name="android:textSize">38sp</item> - </style> - - <style name="PadButtonStyle.Operator.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">28sp</item> - </style> - -</resources> diff --git a/res/values-port/layout.xml b/res/values-w230dp-h220dp/layout.xml index 99ea0b8..acde77e 100644 --- a/res/values-port/layout.xml +++ b/res/values-w230dp-h220dp/layout.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. @@ -17,4 +17,7 @@ <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_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 new file mode 100644 index 0000000..aa83d0c --- /dev/null +++ b/res/values-w230dp-h220dp/styles.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<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">40dip</item> + <item name="maxTextSize">40dip</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">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> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">16dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">22dip</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">22dip</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">18dip</item> + </style> + + <style name="PadLayoutStyle.Advanced"> + <item name="android:elevation">4dip</item> + <item name="android:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">20dip</item> + <item name="android:paddingEnd">20dip</item> + </style> + + <style name="PadLayoutStyle.Numeric"> + <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:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">12dip</item> + <item name="android:paddingEnd">12dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">gone</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:paddingTop">8dip</item> + <item name="android:paddingBottom">24dip</item> + <item name="android:paddingStart">4dip</item> + <item name="android:paddingEnd">28dip</item> + </style> + +</resources> diff --git a/res/values-sw600dp-port/layout.xml b/res/values-w240dp-h320dp/layout.xml index 46d71cb..4eef111 100644 --- a/res/values-sw600dp-port/layout.xml +++ b/res/values-w240dp-h320dp/layout.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. @@ -16,5 +16,8 @@ --> <resources> - <item name="activity_calculator" type="layout">@layout/activity_calculator_tablet_port</item> + <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_one_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-port/styles.xml b/res/values-w240dp-h320dp/styles.xml index a6d2013..a260902 100644 --- a/res/values-port/styles.xml +++ b/res/values-w240dp-h320dp/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. @@ -15,25 +15,27 @@ limitations under the License. --> -<!-- Styles for portrait phone (e.g. Nexus 4/5). --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">8dip</item> - <item name="android:paddingBottom">24dip</item> + <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="minTextSize">32sp</item> - <item name="maxTextSize">56sp</item> - <item name="stepTextSize">8sp</item> + <item name="android:gravity">bottom</item> + <item name="minTextSize">4dip</item> + <item name="maxTextSize">40dip</item> + <item name="stepTextSize">8dip</item> </style> <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">10dip</item> - <item name="android:paddingBottom">32dip</item> + <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:textSize">32sp</item> + <item name="android:gravity">bottom</item> + <item name="android:textSize">40sp</item> + <item name="android:visibility">invisible</item> </style> <style name="PadButtonStyle.Advanced"> @@ -44,24 +46,20 @@ <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">17sp</item> + <item name="android:textSize">16dip</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">32sp</item> - </style> - - <style name="PadButtonStyle.Numeric.Equals"> - <item name="android:visibility">visible</item> + <item name="android:textSize">22dip</item> </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">23sp</item> + <item name="android:textSize">22dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">15sp</item> + <item name="android:textSize">18dip</item> </style> <style name="PadLayoutStyle.Advanced"> @@ -81,6 +79,10 @@ <item name="android:paddingEnd">12dip</item> </style> + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">visible</item> + </style> + <style name="PadLayoutStyle.Operator"> <item name="android:layout_width">0dip</item> <item name="android:layout_weight">96</item> diff --git a/res/values-w320dp-h569dp/layout.xml b/res/values-w320dp-h569dp/layout.xml new file mode 100644 index 0000000..be6eda2 --- /dev/null +++ b/res/values-w320dp-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_5x3</item> +</resources>
\ No newline at end of file diff --git a/res/values-sw400dp-port/styles.xml b/res/values-w320dp-h569dp/styles.xml index c715d52..e659072 100644 --- a/res/values-sw400dp-port/styles.xml +++ b/res/values-w320dp-h569dp/styles.xml @@ -15,17 +15,15 @@ limitations under the License. --> -<!-- Styles for portrait phone (e.g. Nexus 4/5). --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DisplayTextStyle.Formula"> <item name="android:paddingTop">16dip</item> <item name="android:paddingBottom">28dip</item> <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> - <item name="minTextSize">42sp</item> - <item name="maxTextSize">74sp</item> - <item name="stepTextSize">8sp</item> + <item name="minTextSize">42dip</item> + <item name="maxTextSize">74dip</item> + <item name="stepTextSize">8dip</item> </style> <style name="DisplayTextStyle.Result"> @@ -33,31 +31,59 @@ <item name="android:paddingBottom">42dip</item> <item name="android:paddingStart">16dip</item> <item name="android:paddingEnd">16dip</item> - <item name="android:textSize">42sp</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">23sp</item> + <item name="android:textSize">23dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">20sp</item> + <item name="android:textSize">20dip</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">36sp</item> + <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">27sp</item> + <item name="android:textSize">27dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">20sp</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> + + <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-w384dp-h294dp/layout.xml b/res/values-w384dp-h294dp/layout.xml new file mode 100644 index 0000000..acde77e --- /dev/null +++ b/res/values-w384dp-h294dp/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_one_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> +</resources>
\ No newline at end of file diff --git a/res/values-w384dp-h294dp/styles.xml b/res/values-w384dp-h294dp/styles.xml new file mode 100644 index 0000000..dfc53ba --- /dev/null +++ b/res/values-w384dp-h294dp/styles.xml @@ -0,0 +1,97 @@ +<?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">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">40dip</item> + <item name="maxTextSize">40dip</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">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">20dip</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">16dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">22dip</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">22dip</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">18dip</item> + </style> + + <style name="PadLayoutStyle.Advanced"> + <item name="android:elevation">4dip</item> + <item name="android:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">20dip</item> + <item name="android:paddingEnd">20dip</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:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">12dip</item> + <item name="android:paddingEnd">12dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">gone</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:paddingTop">8dip</item> + <item name="android:paddingBottom">24dip</item> + <item name="android:paddingStart">4dip</item> + <item name="android:paddingEnd">28dip</item> + </style> + +</resources> diff --git a/res/values-w384dp-h386dp/layout.xml b/res/values-w384dp-h386dp/layout.xml new file mode 100644 index 0000000..f02b3f0 --- /dev/null +++ b/res/values-w384dp-h386dp/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_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-w384dp-h386dp/styles.xml b/res/values-w384dp-h386dp/styles.xml new file mode 100644 index 0000000..09fde1f --- /dev/null +++ b/res/values-w384dp-h386dp/styles.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<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="minTextSize">32dip</item> + <item name="maxTextSize">40dip</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:textSize">24dip</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">20dip</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">16dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">22dip</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">22dip</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">18dip</item> + </style> + + <style name="PadLayoutStyle.Advanced"> + <item name="android:elevation">4dip</item> + <item name="android:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">20dip</item> + <item name="android:paddingEnd">20dip</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:paddingTop">12dip</item> + <item name="android:paddingBottom">20dip</item> + <item name="android:paddingStart">12dip</item> + <item name="android:paddingEnd">12dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">gone</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:paddingTop">8dip</item> + <item name="android:paddingBottom">24dip</item> + <item name="android:paddingStart">4dip</item> + <item name="android:paddingEnd">28dip</item> + </style> + +</resources> diff --git a/res/values-w450dp-h600dp/layout.xml b/res/values-w450dp-h600dp/layout.xml new file mode 100644 index 0000000..f02b3f0 --- /dev/null +++ b/res/values-w450dp-h600dp/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_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-w450dp-h600dp/styles.xml b/res/values-w450dp-h600dp/styles.xml new file mode 100644 index 0000000..b13065f --- /dev/null +++ b/res/values-w450dp-h600dp/styles.xml @@ -0,0 +1,86 @@ +<?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">24dip</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="stepTextSize">8dip</item> + </style> + + <style name="DisplayTextStyle.Result"> + <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="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">18dip</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item>s + <item name="android:textSize">18dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">38dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">gone</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">28dip</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_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> + <item name="android:paddingEnd">12dip</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: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-land/layout.xml b/res/values-w569dp-h320dp/layout.xml index 8bc268c..4df33a6 100644 --- a/res/values-land/layout.xml +++ b/res/values-w569dp-h320dp/layout.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. @@ -17,4 +17,7 @@ <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_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-land/styles.xml b/res/values-w569dp-h320dp/styles.xml index 3730145..0a3843c 100644 --- a/res/values-land/styles.xml +++ b/res/values-w569dp-h320dp/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. @@ -15,7 +15,6 @@ limitations under the License. --> -<!-- Styles for landscape phone (e.g. Nexus 4/5). --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DisplayTextStyle.Formula"> @@ -23,7 +22,7 @@ <item name="android:paddingBottom">6dip</item> <item name="android:paddingStart">36dip</item> <item name="android:paddingEnd">36dip</item> - <item name="android:textSize">24sp</item> + <item name="android:textSize">24dip</item> </style> <style name="DisplayTextStyle.Result"> @@ -31,22 +30,22 @@ <item name="android:paddingBottom">12dip</item> <item name="android:paddingStart">36dip</item> <item name="android:paddingEnd">36dip</item> - <item name="android:textSize">24sp</item> + <item name="android:textSize">24dip</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">15sp</item> + <item name="android:textSize">15dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">13sp</item> + <item name="android:textSize">13dip</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">23sp</item> + <item name="android:textSize">23dip</item> </style> <style name="PadButtonStyle.Numeric.Equals"> @@ -54,12 +53,12 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">20sp</item> + <item name="android:textSize">20dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">13sp</item> + <item name="android:textSize">13dip</item> </style> <style name="PadLayoutStyle.Advanced"> @@ -74,6 +73,7 @@ <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> <item name="android:layout_weight">240</item> + <item name="android:layout_height">match_parent</item> <item name="android:paddingTop">4dip</item> <item name="android:paddingBottom">4dip</item> <item name="android:paddingStart">8dip</item> @@ -83,10 +83,16 @@ <style name="PadLayoutStyle.Operator"> <item name="android:layout_width">0dip</item> <item name="android:layout_weight">144</item> + <item name="android:layout_height">match_parent</item> <item name="android:paddingTop">4dip</item> <item name="android:paddingBottom">4dip</item> <item name="android:paddingStart">12dip</item> <item name="android:paddingEnd">12dip</item> </style> -</resources> + <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-w600dp-h466dp/layout.xml new file mode 100644 index 0000000..cbb2d49 --- /dev/null +++ b/res/values-w600dp-h466dp/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_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_operator" type="layout">@layout/pad_operator_two_col</item> +</resources>
\ No newline at end of file diff --git a/res/values-w600dp-h466dp/styles.xml b/res/values-w600dp-h466dp/styles.xml new file mode 100644 index 0000000..6922663 --- /dev/null +++ b/res/values-w600dp-h466dp/styles.xml @@ -0,0 +1,96 @@ +<?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">24dip</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="stepTextSize">8dip</item> + </style> + + <style name="DisplayTextStyle.Result"> + <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="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">18dip</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item>s + <item name="android:textSize">18dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">38dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">gone</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">28dip</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">20dip</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">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.Advanced"> + <item name="android:layout_height">match_parent</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">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-w600dp-h614dp/layout.xml new file mode 100644 index 0000000..cbb2d49 --- /dev/null +++ b/res/values-w600dp-h614dp/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_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_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-w600dp-h614dp/styles.xml new file mode 100644 index 0000000..2f4fdc7 --- /dev/null +++ b/res/values-w600dp-h614dp/styles.xml @@ -0,0 +1,97 @@ +<?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. + --> + +<!-- Styles for portrait 800dip-wide tablet (e.g. Nexus 10). --> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="DisplayTextStyle.Formula"> + <item name="android:paddingTop">24dip</item> + <item name="android:paddingBottom">32dip</item> + <item name="android:paddingStart">44dip</item> + <item name="android:paddingEnd">44dip</item> + <item name="minTextSize">60dip</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">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">18dip</item> + </style> + + <style name="PadButtonStyle.Advanced.Text"> + <item name="android:textAllCaps">true</item>s + <item name="android:textSize">18dip</item> + </style> + + <style name="PadButtonStyle.Numeric"> + <item name="android:textSize">38dip</item> + </style> + + <style name="PadButtonStyle.Numeric.Equals"> + <item name="android:visibility">gone</item> + </style> + + <style name="PadButtonStyle.Operator"> + <item name="android:textSize">28dip</item> + </style> + + <style name="PadButtonStyle.Operator.Text"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">20dip</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">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.Advanced"> + <item name="android:layout_height">match_parent</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">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-sw800dp-port/layout.xml b/res/values-w768dp-h900dp/layout.xml index 46d71cb..a32c6ba 100644 --- a/res/values-sw800dp-port/layout.xml +++ b/res/values-w768dp-h900dp/layout.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. @@ -17,4 +17,7 @@ <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_operator" type="layout">@layout/pad_operator_two_col</item> </resources>
\ No newline at end of file diff --git a/res/values-sw600dp-port/styles.xml b/res/values-w768dp-h900dp/styles.xml index f439521..8b74525 100644 --- a/res/values-sw600dp-port/styles.xml +++ b/res/values-w768dp-h900dp/styles.xml @@ -15,8 +15,6 @@ limitations under the License. --> - -<!-- Styles for portrait 600dip-wide tablet (e.g. Nexus 7). --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DisplayTextStyle.Formula"> @@ -77,6 +75,7 @@ <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> <item name="android:layout_weight">500</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> @@ -86,16 +85,16 @@ <style name="PadLayoutStyle.Operator"> <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">8dip</item> <item name="android:paddingBottom">8dip</item> <item name="android:paddingStart">8dip</item> <item name="android:paddingEnd">8dip</item> </style> - <style name="PadLinearLayoutStyle"> + <style name="DisplayLayoutStyle"> <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">0dip</item> - <item name="android:layout_weight">500</item> + <item name="android:layout_height">wrap_content</item> </style> </resources> diff --git a/res/values-w960dp-h600dp/layout.xml b/res/values-w960dp-h600dp/layout.xml new file mode 100644 index 0000000..4df33a6 --- /dev/null +++ b/res/values-w960dp-h600dp/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_land</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> +</resources>
\ No newline at end of file diff --git a/res/values-sw600dp-land/styles.xml b/res/values-w960dp-h600dp/styles.xml index d25fe6b..ed8614a 100644 --- a/res/values-sw600dp-land/styles.xml +++ b/res/values-w960dp-h600dp/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. @@ -15,38 +15,39 @@ limitations under the License. --> -<!-- Styles for landscape 600dip-wide tablet (e.g. Nexus 7). --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DisplayTextStyle.Formula"> - <item name="android:paddingTop">4dip</item> - <item name="android:paddingBottom">16dip</item> + <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="android:textSize">42sp</item> + <item name="minTextSize">60dip</item> + <item name="maxTextSize">76dip</item> + <item name="stepTextSize">8dip</item> </style> <style name="DisplayTextStyle.Result"> - <item name="android:paddingTop">18dip</item> - <item name="android:paddingBottom">30dip</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">42sp</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">27sp</item> + <item name="android:textSize">18dip</item> </style> <style name="PadButtonStyle.Advanced.Text"> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">24sp</item> + <item name="android:textAllCaps">true</item>s + <item name="android:textSize">18dip</item> </style> <style name="PadButtonStyle.Numeric"> - <item name="android:textSize">36sp</item> + <item name="android:textSize">38dip</item> </style> <style name="PadButtonStyle.Numeric.Equals"> @@ -54,15 +55,15 @@ </style> <style name="PadButtonStyle.Operator"> - <item name="android:textSize">36sp</item> + <item name="android:textSize">28dip</item> </style> <style name="PadButtonStyle.Operator.Text"> <item name="android:textAllCaps">true</item> - <item name="android:textSize">24sp</item> + <item name="android:textSize">20dip</item> </style> - <style name="PadLayoutStyle.Advanced"> + <style name="PadLayoutStyle.Numeric"> <item name="android:layout_width">0dip</item> <item name="android:layout_weight">500</item> <item name="android:paddingTop">10dip</item> @@ -71,22 +72,27 @@ <item name="android:paddingEnd">18dip</item> </style> - <style name="PadLayoutStyle.Numeric"> + <style name="PadLayoutStyle.Operator"> <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">500</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.Operator"> + <style name="PadLayoutStyle.Advanced"> <item name="android:layout_width">0dip</item> - <item name="android:layout_weight">280</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> </style> -</resources> + <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-port/dimens.xml b/res/values/dimens.xml index dd66e9a..5218acd 100644 --- a/res/values-port/dimens.xml +++ b/res/values/dimens.xml @@ -18,6 +18,6 @@ <resources> <!-- The margin between the pad pages when displayed using a view pager. --> - <dimen name="pad_page_margin">-24dip</dimen> + <dimen name="pad_page_margin">24dip</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2a074e8..2a29c04 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -66,4 +66,10 @@ <item name="android:layout_height">match_parent</item> </style> + <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> + </style> + </resources> |