ExactCalculator: Use two-line display as standard, redo alt layouts

Change-Id: I7ae18d6ccaf55687780aaed0ff78d17acd1b5cfc
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml
index dfb5f16..522ed3b 100644
--- a/res/layout/activity_calculator_land.xml
+++ b/res/layout/activity_calculator_land.xml
@@ -29,7 +29,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="1">
+        android:layout_weight="100">
 
         <include layout="@layout/pad_advanced" />
         <include layout="@layout/pad_numeric" />
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index c8ac135..43497eb 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -29,7 +29,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:orientation="vertical"
-        android:layout_weight="250">
+        android:layout_weight="225">
 
         <include layout="@layout/pad_operator_aux" />
 
diff --git a/res/values-w520dp-h500dp-land/dimens.xml b/res/values-land/dimens.xml
similarity index 81%
rename from res/values-w520dp-h500dp-land/dimens.xml
rename to res/values-land/dimens.xml
index 26b0586..541b892 100644
--- a/res/values-w520dp-h500dp-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -17,18 +17,18 @@
 
 <resources>
     <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">16dip</dimen>
+    <dimen name="formula_padding_top">8dip</dimen>
     <dimen name="formula_padding_bottom">28dip</dimen>
     <dimen name="formula_padding_start">16dip</dimen>
     <dimen name="formula_padding_end">16dip</dimen>
     <dimen name="formula_min_textsize">42dip</dimen>
-    <dimen name="formula_max_textsize">96dip</dimen>
+    <dimen name="formula_max_textsize">56dip</dimen>
     <dimen name="formula_step_textsize">8dip</dimen>
 
     <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">16dip</dimen>
-    <dimen name="result_padding_bottom">42dip</dimen>
+    <dimen name="result_padding_top">8dip</dimen>
+    <dimen name="result_padding_bottom">28dip</dimen>
     <dimen name="result_padding_start">16dip</dimen>
     <dimen name="result_padding_end">16dip</dimen>
-    <dimen name="result_textsize">48dip</dimen>
+    <dimen name="result_textsize">42dip</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-w520dp-h375dp-land/layout.xml b/res/values-land/layout.xml
similarity index 93%
rename from res/values-w520dp-h375dp-land/layout.xml
rename to res/values-land/layout.xml
index 6aed628..ffe53a8 100644
--- a/res/values-w520dp-h375dp-land/layout.xml
+++ b/res/values-land/layout.xml
@@ -1,23 +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_3x4</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
+<?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_one_line</item>

+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x4</item>

+    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>

+</resources>

diff --git a/res/values-w520dp-h500dp-land/styles.xml b/res/values-land/styles.xml
similarity index 94%
rename from res/values-w520dp-h500dp-land/styles.xml
rename to res/values-land/styles.xml
index f4ce461..7fd6d05 100644
--- a/res/values-w520dp-h500dp-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -44,8 +44,8 @@
     </style>
 
     <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_weight">5</item>
         <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">150</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
@@ -54,7 +54,7 @@
 
     <style name="PadLayoutStyle.Numeric">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">5</item>
+        <item name="android:layout_weight">200</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
@@ -63,7 +63,7 @@
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">3</item>
+        <item name="android:layout_weight">125</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
diff --git a/res/values-w375dp-h768dp-port/dimens.xml b/res/values-sw600dp-land/dimens.xml
similarity index 73%
copy from res/values-w375dp-h768dp-port/dimens.xml
copy to res/values-sw600dp-land/dimens.xml
index 3eefd89..b5c6b6c 100644
--- a/res/values-w375dp-h768dp-port/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -17,18 +17,18 @@
 
 <resources>
     <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">16dip</dimen>
-    <dimen name="formula_padding_bottom">32dip</dimen>
+    <dimen name="formula_padding_top">32dip</dimen>
+    <dimen name="formula_padding_bottom">22dip</dimen>
     <dimen name="formula_padding_start">44dip</dimen>
     <dimen name="formula_padding_end">44dip</dimen>
-    <dimen name="formula_min_textsize">48dip</dimen>
-    <dimen name="formula_max_textsize">96dip</dimen>
+    <dimen name="formula_min_textsize">32dip</dimen>
+    <dimen name="formula_max_textsize">128dip</dimen>
     <dimen name="formula_step_textsize">8dip</dimen>
 
     <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">20dip</dimen>
-    <dimen name="result_padding_bottom">48dip</dimen>
+    <dimen name="result_padding_top">22dip</dimen>
+    <dimen name="result_padding_bottom">44dip</dimen>
     <dimen name="result_padding_start">44dip</dimen>
     <dimen name="result_padding_end">44dip</dimen>
-    <dimen name="result_textsize">64dip</dimen>
+    <dimen name="result_textsize">72dip</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-w520dp-h500dp-land/layout.xml b/res/values-sw600dp-land/layout.xml
similarity index 100%
rename from res/values-w520dp-h500dp-land/layout.xml
rename to res/values-sw600dp-land/layout.xml
diff --git a/res/values-w520dp-h375dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
similarity index 91%
rename from res/values-w520dp-h375dp-land/styles.xml
rename to res/values-sw600dp-land/styles.xml
index 8de5af8..b6feb8e 100644
--- a/res/values-w520dp-h375dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -18,8 +18,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_weight">5</item>
         <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">100</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
@@ -28,7 +28,7 @@
 
     <style name="PadLayoutStyle.Numeric">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">5</item>
+        <item name="android:layout_weight">150</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
@@ -37,7 +37,7 @@
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">3</item>
+        <item name="android:layout_weight">100</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
diff --git a/res/values-w375dp-h768dp-port/dimens.xml b/res/values-sw600dp/dimens.xml
similarity index 77%
rename from res/values-w375dp-h768dp-port/dimens.xml
rename to res/values-sw600dp/dimens.xml
index 3eefd89..e431b75 100644
--- a/res/values-w375dp-h768dp-port/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -17,18 +17,18 @@
 
 <resources>
     <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">16dip</dimen>
-    <dimen name="formula_padding_bottom">32dip</dimen>
+    <dimen name="formula_padding_top">32dip</dimen>
+    <dimen name="formula_padding_bottom">22dip</dimen>
     <dimen name="formula_padding_start">44dip</dimen>
     <dimen name="formula_padding_end">44dip</dimen>
     <dimen name="formula_min_textsize">48dip</dimen>
-    <dimen name="formula_max_textsize">96dip</dimen>
+    <dimen name="formula_max_textsize">128dip</dimen>
     <dimen name="formula_step_textsize">8dip</dimen>
 
     <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">20dip</dimen>
-    <dimen name="result_padding_bottom">48dip</dimen>
+    <dimen name="result_padding_top">22dip</dimen>
+    <dimen name="result_padding_bottom">64dip</dimen>
     <dimen name="result_padding_start">44dip</dimen>
     <dimen name="result_padding_end">44dip</dimen>
-    <dimen name="result_textsize">64dip</dimen>
+    <dimen name="result_textsize">72dip</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-w375dp-h768dp-port/layout.xml b/res/values-sw600dp/layout.xml
similarity index 91%
rename from res/values-w375dp-h768dp-port/layout.xml
rename to res/values-sw600dp/layout.xml
index c251200..6e2d219 100644
--- a/res/values-w375dp-h768dp-port/layout.xml
+++ b/res/values-sw600dp/layout.xml
@@ -16,8 +16,9 @@
   -->
 
 <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_advanced" type="layout">@layout/pad_advanced_4x3</item>
     <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>
 </resources>
diff --git a/res/values-w520dp-h768dp-land/styles.xml b/res/values-sw600dp/styles.xml
similarity index 65%
rename from res/values-w520dp-h768dp-land/styles.xml
rename to res/values-sw600dp/styles.xml
index df9b3a7..ab61eaa 100644
--- a/res/values-w520dp-h768dp-land/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -44,30 +44,39 @@
     </style>
 
     <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_weight">5</item>
-        <item name="android:layout_width">0dip</item>
-        <item name="android:paddingTop">8dip</item>
+        <item name="android:layout_height">0dip</item>
+        <item name="android:layout_weight">100</item>
+        <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
-        <item name="android:paddingStart">12dip</item>
-        <item name="android:paddingEnd">12dip</item>
+        <item name="android:paddingStart">18dip</item>
+        <item name="android:paddingEnd">18dip</item>
+    </style>
+
+	<style name="PadLayoutStyle.OperatorAux">
+        <item name="android:layout_height">0dip</item>
+        <item name="android:layout_weight">200</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">0dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">5</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>
+        <item name="android:layout_weight">750</item>
+        <item name="android:paddingTop">0dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">0dip</item>
     </style>
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">3</item>
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">24dip</item>
-        <item name="android:paddingStart">12dip</item>
-        <item name="android:paddingEnd">12dip</item>
+        <item name="android:layout_weight">250</item>
+        <item name="android:paddingTop">0dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">0dip</item>
+        <item name="android:paddingEnd">8dip</item>
     </style>
 
 </resources>
diff --git a/res/values-w520dp-h375dp-land/dimens.xml b/res/values-w520dp-h375dp-land/dimens.xml
deleted file mode 100644
index 42deae9..0000000
--- a/res/values-w520dp-h375dp-land/dimens.xml
+++ /dev/null
@@ -1,34 +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.
-  -->
-
-<resources>
-    <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">2dip</dimen>
-    <dimen name="formula_padding_bottom">10dip</dimen>
-    <dimen name="formula_padding_start">36dip</dimen>
-    <dimen name="formula_padding_end">36dip</dimen>
-    <dimen name="formula_min_textsize">32dip</dimen>
-    <dimen name="formula_max_textsize">48dip</dimen>
-    <dimen name="formula_step_textsize">8dip</dimen>
-
-    <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">12dip</dimen>
-    <dimen name="result_padding_bottom">18dip</dimen>
-    <dimen name="result_padding_start">36dip</dimen>
-    <dimen name="result_padding_end">36dip</dimen>
-    <dimen name="result_textsize">32dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-w520dp-h768dp-land/dimens.xml b/res/values-w520dp-h768dp-land/dimens.xml
deleted file mode 100644
index 0b7e4f8..0000000
--- a/res/values-w520dp-h768dp-land/dimens.xml
+++ /dev/null
@@ -1,34 +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.
-  -->
-
-<resources>
-    <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">24dip</dimen>
-    <dimen name="formula_padding_bottom">32dip</dimen>
-    <dimen name="formula_padding_start">44dip</dimen>
-    <dimen name="formula_padding_end">44dip</dimen>
-    <dimen name="formula_min_textsize">44dip</dimen>
-    <dimen name="formula_max_textsize">96dip</dimen>
-    <dimen name="formula_step_textsize">8dip</dimen>
-
-    <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">24dip</dimen>
-    <dimen name="result_padding_bottom">56dip</dimen>
-    <dimen name="result_padding_start">44dip</dimen>
-    <dimen name="result_padding_end">44dip</dimen>
-    <dimen name="result_textsize">48dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-w520dp-h768dp-land/layout.xml b/res/values-w520dp-h768dp-land/layout.xml
deleted file mode 100644
index 6aed628..0000000
--- a/res/values-w520dp-h768dp-land/layout.xml
+++ /dev/null
@@ -1,23 +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.
-  -->
-
-<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_3x4</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
diff --git a/res/values-w520dp-h768dp-port/dimens.xml b/res/values-w520dp-h768dp-port/dimens.xml
deleted file mode 100644
index 3eefd89..0000000
--- a/res/values-w520dp-h768dp-port/dimens.xml
+++ /dev/null
@@ -1,34 +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.
-  -->
-
-<resources>
-    <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">16dip</dimen>
-    <dimen name="formula_padding_bottom">32dip</dimen>
-    <dimen name="formula_padding_start">44dip</dimen>
-    <dimen name="formula_padding_end">44dip</dimen>
-    <dimen name="formula_min_textsize">48dip</dimen>
-    <dimen name="formula_max_textsize">96dip</dimen>
-    <dimen name="formula_step_textsize">8dip</dimen>
-
-    <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">20dip</dimen>
-    <dimen name="result_padding_bottom">48dip</dimen>
-    <dimen name="result_padding_start">44dip</dimen>
-    <dimen name="result_padding_end">44dip</dimen>
-    <dimen name="result_textsize">64dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-w520dp-h768dp-port/layout.xml b/res/values-w520dp-h768dp-port/layout.xml
deleted file mode 100644
index c251200..0000000
--- a/res/values-w520dp-h768dp-port/layout.xml
+++ /dev/null
@@ -1,23 +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.
-  -->
-
-<resources>
-    <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>
-    <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
-</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 286ee4f..e1a59a0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -23,17 +23,17 @@
     <dimen name="history_item_text_padding_bottom">16dip</dimen>
 
     <!-- Dimens for display formula. -->
-    <dimen name="formula_padding_top">0dip</dimen>
+    <dimen name="formula_padding_top">16dip</dimen>
     <dimen name="formula_padding_bottom">8dip</dimen>
     <dimen name="formula_padding_start">16dip</dimen>
     <dimen name="formula_padding_end">16dip</dimen>
-    <dimen name="formula_min_textsize">28dip</dimen>
+    <dimen name="formula_min_textsize">32dip</dimen>
     <dimen name="formula_max_textsize">48dip</dimen>
     <dimen name="formula_step_textsize">8dip</dimen>
 
     <!-- Dimens for display result. -->
-    <dimen name="result_padding_top">0dip</dimen>
-    <dimen name="result_padding_bottom">8dip</dimen>
+    <dimen name="result_padding_top">8dip</dimen>
+    <dimen name="result_padding_bottom">32dip</dimen>
     <dimen name="result_padding_start">16dip</dimen>
     <dimen name="result_padding_end">16dip</dimen>
     <dimen name="result_textsize">32dip</dimen>
diff --git a/res/values/layout.xml b/res/values/layout.xml
index d885113..6e2d219 100644
--- a/res/values/layout.xml
+++ b/res/values/layout.xml
@@ -17,7 +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="display" type="layout">@layout/display_two_line</item>
     <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 208ac6f..3bf365a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -98,7 +98,7 @@
 
     <style name="PadLayoutStyle.Advanced">
         <item name="android:layout_height">0dip</item>
-        <item name="android:layout_weight">125</item>
+        <item name="android:layout_weight">100</item>
         <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">18dip</item>