Polish layout configurations

Bug: 30089158

- Match previous fullscreen layouts on supported devices.
- Prevent clipping in some MW layouts.
- Experimental support for freeform:
    adb shell settings put global enable_freeform_support 1

Change-Id: Ia6568d337709fa1b1420d88cb3c701e048ce7a25

36 files changed, 685 insertions, 334 deletions

diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index 0a5a896..4cafa94 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -27,7 +27,7 @@
         android:id="@+id/pad_pager"
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="2"
+        android:layout_weight="1"
         android:overScrollMode="never">
 
         <LinearLayout
diff --git a/res/layout/display_one_line.xml b/res/layout/display_one_line.xml
index 4737d4a..c016b15 100644
--- a/res/layout/display_one_line.xml
+++ b/res/layout/display_one_line.xml
@@ -18,7 +18,8 @@
 <com.android.calculator2.CalculatorDisplay
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/display"
-    style="@style/DisplayLayoutStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="@color/display_background_color"
     android:clipChildren="false"
     android:elevation="4dip"
diff --git a/res/layout/display_two_line.xml b/res/layout/display_two_line.xml
index 5da0720..3735a85 100644
--- a/res/layout/display_two_line.xml
+++ b/res/layout/display_two_line.xml
@@ -18,7 +18,8 @@
 <com.android.calculator2.CalculatorDisplay
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/display"
-    style="@style/DisplayLayoutStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="@color/display_background_color"
     android:elevation="4dip"
     android:orientation="vertical">
diff --git a/res/values-w230dp-h220dp/layout.xml b/res/values-w230dp-h220dp/layout.xml
index 23e7c36..0e698d5 100644
--- a/res/values-w230dp-h220dp/layout.xml
+++ b/res/values-w230dp-h220dp/layout.xml
@@ -20,4 +20,4 @@
     <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_4x4</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w230dp-h220dp/styles.xml b/res/values-w230dp-h220dp/styles.xml
index 78d7e3a..88a52ce 100644
--- a/res/values-w230dp-h220dp/styles.xml
+++ b/res/values-w230dp-h220dp/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.
@@ -23,8 +23,8 @@
         <item name="android:paddingStart">16dip</item>
         <item name="android:paddingEnd">16dip</item>
         <item name="android:gravity">bottom</item>
-        <item name="minTextSize">32dip</item>
-        <item name="maxTextSize">32dip</item>
+        <item name="minTextSize">28dip</item>
+        <item name="maxTextSize">28dip</item>
         <item name="stepTextSize">8dip</item>
     </style>
 
@@ -34,62 +34,61 @@
         <item name="android:paddingStart">16dip</item>
         <item name="android:paddingEnd">16dip</item>
         <item name="android:gravity">bottom</item>
-        <item name="android:textSize">32dip</item>
+        <item name="android:textSize">28dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
-        <item name="android:textSize">20dip</item>
+        <item name="android:textSize">14dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16dip</item>
+        <item name="android:textSize">12dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">16dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">visible</item>
     </style>
 
     <style name="PadButtonStyle.Operator">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">14dip</item>
     </style>
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">18dip</item>
+        <item name="android:textSize">12dip</item>
     </style>
 
     <style name="PadLayoutStyle.Advanced">
         <item name="android:elevation">4dip</item>
-        <item name="android:paddingTop">0dip</item>
+        <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
-        <item name="android:paddingStart">20dip</item>
-        <item name="android:paddingEnd">20dip</item>
+        <item name="android:paddingStart">18dip</item>
+        <item name="android:paddingEnd">18dip</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">0dip</item>
+        <item name="android:layout_weight">7</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>
-    </style>
-
-    <style name="PadButtonStyle.Numeric.Equals">
-        <item name="android:visibility">visible</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
     </style>
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">96</item>
-        <item name="android:paddingTop">0dip</item>
+        <item name="android:layout_weight">3</item>
+        <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">4dip</item>
         <item name="android:paddingEnd">28dip</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w230dp-h275dp/layout.xml b/res/values-w230dp-h275dp/layout.xml
index 3e97b80..f9a2d97 100644
--- a/res/values-w230dp-h275dp/layout.xml
+++ b/res/values-w230dp-h275dp/layout.xml
@@ -20,4 +20,4 @@
     <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_4x4</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w230dp-h275dp/styles.xml b/res/values-w230dp-h275dp/styles.xml
index de1705e..2f715a3 100644
--- a/res/values-w230dp-h275dp/styles.xml
+++ b/res/values-w230dp-h275dp/styles.xml
@@ -23,8 +23,8 @@
         <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="minTextSize">28dip</item>
+        <item name="maxTextSize">28dip</item>
         <item name="stepTextSize">8dip</item>
     </style>
 
@@ -34,62 +34,61 @@
         <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:textSize">28dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
-        <item name="android:textSize">20dip</item>
+        <item name="android:textSize">16dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16dip</item>
+        <item name="android:textSize">14dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric">
-        <item name="android:textSize">26dip</item>
+        <item name="android:textSize">18dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">visible</item>
     </style>
 
     <style name="PadButtonStyle.Operator">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">16dip</item>
     </style>
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">18dip</item>
+        <item name="android:textSize">14dip</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>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">18dip</item>
+        <item name="android:paddingEnd">18dip</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="PadButtonStyle.Numeric.Equals">
-        <item name="android:visibility">visible</item>
+        <item name="android:layout_weight">7</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</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:layout_weight">3</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">4dip</item>
         <item name="android:paddingEnd">28dip</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w396dp-h275dp/layout.xml b/res/values-w230dp-h375dp/layout.xml
index 3e97b80..f9a2d97 100644
--- a/res/values-w396dp-h275dp/layout.xml
+++ b/res/values-w230dp-h375dp/layout.xml
@@ -20,4 +20,4 @@
     <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_4x4</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w230dp-h375dp/styles.xml b/res/values-w230dp-h375dp/styles.xml
new file mode 100644
index 0000000..4aa32d8
--- /dev/null
+++ b/res/values-w230dp-h375dp/styles.xml
@@ -0,0 +1,92 @@
+<?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">2dip</item>
+        <item name="android:paddingBottom">10dip</item>
+        <item name="android:paddingStart">16dip</item>
+        <item name="android:paddingEnd">16dip</item>
+        <item name="minTextSize">32dip</item>
+        <item name="maxTextSize">32dip</item>
+        <item name="stepTextSize">8dip</item>
+    </style>
+
+    <style name="DisplayTextStyle.Result">
+        <item name="android:paddingTop">12dip</item>
+        <item name="android:paddingBottom">18dip</item>
+        <item name="android:paddingStart">16dip</item>
+        <item name="android:paddingEnd">16dip</item>
+        <item name="android:textSize">32dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced">
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
+        <item name="android:textColor">@color/pad_button_advanced_text_color</item>
+        <item name="android:textSize">17dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">15dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric">
+        <item name="android:textSize">27dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">visible</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator">
+        <item name="android:textSize">24dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">15dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Advanced">
+        <item name="android:elevation">4dip</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">18dip</item>
+        <item name="android:paddingEnd">18dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Numeric">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">7</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Operator">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">3</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">4dip</item>
+        <item name="android:paddingEnd">28dip</item>
+    </style>
+
+</resources>
diff --git a/res/values-w230dp-h500dp/layout.xml b/res/values-w230dp-h475dp-port/layout.xml
index d9db1f0..9f7bd6b 100644
--- a/res/values-w230dp-h500dp/layout.xml
+++ b/res/values-w230dp-h475dp-port/layout.xml
@@ -20,4 +20,4 @@
     <item name="display" type="layout">@layout/display_two_line</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w396dp-h275dp/styles.xml b/res/values-w230dp-h475dp-port/styles.xml
index d640c7a..050de1e 100644
--- a/res/values-w396dp-h275dp/styles.xml
+++ b/res/values-w230dp-h475dp-port/styles.xml
@@ -18,23 +18,21 @@
 <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:paddingTop">8dip</item>
+        <item name="android:paddingBottom">18dip</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="minTextSize">32dip</item>
+        <item name="maxTextSize">56dip</item>
         <item name="stepTextSize">8dip</item>
     </style>
 
     <style name="DisplayTextStyle.Result">
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">18dip</item>
+        <item name="android:paddingTop">18dip</item>
+        <item name="android:paddingBottom">36dip</item>
         <item name="android:paddingStart">16dip</item>
         <item name="android:paddingEnd">16dip</item>
-        <item name="android:gravity">bottom</item>
-        <item name="android:textSize">40dip</item>
+        <item name="android:textSize">32dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
@@ -45,47 +43,46 @@
 
     <style name="PadButtonStyle.Advanced.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16dip</item>
+        <item name="android:textSize">17dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">32dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">visible</item>
     </style>
 
     <style name="PadButtonStyle.Operator">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">23dip</item>
     </style>
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">18dip</item>
+        <item name="android:textSize">17dip</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>
+        <item name="android:paddingStart">18dip</item>
+        <item name="android:paddingEnd">18dip</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:layout_weight">7</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">visible</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
     </style>
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">96</item>
+        <item name="android:layout_weight">3</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">24dip</item>
         <item name="android:paddingStart">4dip</item>
diff --git a/res/values-w396dp-h220dp/layout.xml b/res/values-w375dp-h220dp/layout.xml
index acde77e..ac4cde8 100644
--- a/res/values-w396dp-h220dp/layout.xml
+++ b/res/values-w375dp-h220dp/layout.xml
@@ -20,4 +20,4 @@
     <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
+</resources>
diff --git a/res/values-w396dp-h220dp/styles.xml b/res/values-w375dp-h220dp/styles.xml
index 0d32c2a..3c6fe85 100644
--- a/res/values-w396dp-h220dp/styles.xml
+++ b/res/values-w375dp-h220dp/styles.xml
@@ -23,8 +23,8 @@
         <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="minTextSize">28dip</item>
+        <item name="maxTextSize">28dip</item>
         <item name="stepTextSize">8dip</item>
     </style>
 
@@ -34,37 +34,40 @@
         <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>
+        <item name="android:textSize">28dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
-        <item name="android:textSize">20dip</item>
+        <item name="android:textSize">14dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16dip</item>
+        <item name="android:textSize">12dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">16dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">gone</item>
     </style>
 
     <style name="PadButtonStyle.Operator">
-        <item name="android:textSize">22dip</item>
+        <item name="android:textSize">14dip</item>
     </style>
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">18dip</item>
+        <item name="android:textSize">12dip</item>
     </style>
 
     <style name="PadLayoutStyle.Advanced">
         <item name="android:elevation">4dip</item>
-        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">20dip</item>
         <item name="android:paddingEnd">20dip</item>
@@ -72,21 +75,17 @@
 
     <style name="PadLayoutStyle.Numeric">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:paddingTop">8dip</item>
+        <item name="android:layout_weight">5</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>
-    </style>
-
-    <style name="PadButtonStyle.Numeric.Equals">
-        <item name="android:visibility">gone</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
     </style>
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:paddingTop">8dip</item>
+        <item name="android:layout_weight">3</item>
+        <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">4dip</item>
         <item name="android:paddingEnd">28dip</item>
diff --git a/res/values-w375dp-h275dp/layout.xml b/res/values-w375dp-h275dp/layout.xml
new file mode 100644
index 0000000..3890667
--- /dev/null
+++ b/res/values-w375dp-h275dp/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>
diff --git a/res/values-w520dp-h275dp/styles.xml b/res/values-w375dp-h275dp/styles.xml
index 03d4871..c628645 100644
--- a/res/values-w520dp-h275dp/styles.xml
+++ b/res/values-w375dp-h275dp/styles.xml
@@ -20,34 +20,36 @@
     <style name="DisplayTextStyle.Formula">
         <item name="android:paddingTop">0dip</item>
         <item name="android:paddingBottom">0dip</item>
-        <item name="android:paddingStart">44dip</item>
-        <item name="android:paddingEnd">44dip</item>
-        <item name="minTextSize">24dip</item>
-        <item name="maxTextSize">32dip</item>
+        <item name="android:paddingStart">16dip</item>
+        <item name="android:paddingEnd">16dip</item>
+        <item name="android:gravity">bottom</item>
+        <item name="minTextSize">28dip</item>
+        <item name="maxTextSize">28dip</item>
         <item name="stepTextSize">8dip</item>
     </style>
 
     <style name="DisplayTextStyle.Result">
         <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">24dip</item>
-        <item name="android:paddingStart">44dip</item>
-        <item name="android:paddingEnd">44dip</item>
-        <item name="android:textSize">24dip</item>
+        <item name="android:paddingBottom">0dip</item>
+        <item name="android:paddingStart">16dip</item>
+        <item name="android:paddingEnd">16dip</item>
+        <item name="android:gravity">bottom</item>
+        <item name="android:textSize">28dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
-        <item name="android:textSize">18dip</item>
+        <item name="android:textSize">17dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced.Text">
-        <item name="android:textAllCaps">true</item>s
-        <item name="android:textSize">18dip</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">14dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric">
-        <item name="android:textSize">26dip</item>
+        <item name="android:textSize">20dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric.Equals">
@@ -55,42 +57,38 @@
     </style>
 
     <style name="PadButtonStyle.Operator">
-        <item name="android:textSize">28dip</item>
+        <item name="android:textSize">17dip</item>
     </style>
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">20dip</item>
+        <item name="android:textSize">14dip</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 name="PadLayoutStyle.Advanced">
+        <item name="android:elevation">4dip</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</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">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>
+        <item name="android:layout_weight">5</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
     </style>
 
-    <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">40</item>
+    <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:paddingTop">8dip</item>
+        <item name="android:layout_weight">3</item>
+        <item name="android:paddingTop">2dip</item>
         <item name="android:paddingBottom">8dip</item>
-        <item name="android:paddingStart">16dip</item>
-        <item name="android:paddingEnd">16dip</item>
+        <item name="android:paddingStart">4dip</item>
+        <item name="android:paddingEnd">28dip</item>
     </style>
 
 </resources>
diff --git a/res/values-w375dp-h375dp/layout.xml b/res/values-w375dp-h375dp/layout.xml
new file mode 100644
index 0000000..3890667
--- /dev/null
+++ b/res/values-w375dp-h375dp/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>
diff --git a/res/values-w375dp-h375dp/styles.xml b/res/values-w375dp-h375dp/styles.xml
new file mode 100644
index 0000000..14e96ca
--- /dev/null
+++ b/res/values-w375dp-h375dp/styles.xml
@@ -0,0 +1,92 @@
+<?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">2dip</item>
+        <item name="android:paddingBottom">10dip</item>
+        <item name="android:paddingStart">16dip</item>
+        <item name="android:paddingEnd">16dip</item>
+        <item name="minTextSize">32dip</item>
+        <item name="maxTextSize">32dip</item>
+        <item name="stepTextSize">8dip</item>
+    </style>
+
+    <style name="DisplayTextStyle.Result">
+        <item name="android:paddingTop">12dip</item>
+        <item name="android:paddingBottom">18dip</item>
+        <item name="android:paddingStart">16dip</item>
+        <item name="android:paddingEnd">16dip</item>
+        <item name="android:textSize">32dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced">
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
+        <item name="android:textColor">@color/pad_button_advanced_text_color</item>
+        <item name="android:textSize">17dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">15dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric">
+        <item name="android:textSize">27dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator">
+        <item name="android:textSize">24dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">15dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Advanced">
+        <item name="android:elevation">4dip</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</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">5</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="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">8dip</item>
+        <item name="android:paddingStart">4dip</item>
+        <item name="android:paddingEnd">28dip</item>
+    </style>
+
+</resources>
diff --git a/res/values-w396dp-h500dp/layout.xml b/res/values-w375dp-h500dp-port/layout.xml
index d9db1f0..9f7bd6b 100644
--- a/res/values-w396dp-h500dp/layout.xml
+++ b/res/values-w375dp-h500dp-port/layout.xml
@@ -20,4 +20,4 @@
     <item name="display" type="layout">@layout/display_two_line</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w230dp-h500dp/styles.xml b/res/values-w375dp-h500dp-port/styles.xml
index 9cdb455..066aa8e 100644
--- a/res/values-w230dp-h500dp/styles.xml
+++ b/res/values-w375dp-h500dp-port/styles.xml
@@ -63,10 +63,17 @@
         <item name="android:textSize">20dip</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">264</item>
-        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">7</item>
         <item name="android:paddingTop">12dip</item>
         <item name="android:paddingBottom">20dip</item>
         <item name="android:paddingStart">12dip</item>
@@ -75,11 +82,11 @@
 
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">96</item>
+        <item name="android:layout_weight">3</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
+</resources>
diff --git a/res/values-w396dp-h768dp/layout.xml b/res/values-w375dp-h768dp-port/layout.xml
index 80633ce..98db0fe 100644
--- a/res/values-w396dp-h768dp/layout.xml
+++ b/res/values-w375dp-h768dp-port/layout.xml
@@ -20,4 +20,4 @@
     <item name="display" type="layout">@layout/display_two_line</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w396dp-h768dp/styles.xml b/res/values-w375dp-h768dp-port/styles.xml
index 84bfb9c..ec91033 100644
--- a/res/values-w396dp-h768dp/styles.xml
+++ b/res/values-w375dp-h768dp-port/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.
@@ -75,7 +75,6 @@
     <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>
@@ -85,16 +84,10 @@
     <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">4dip</item>
         <item name="android:paddingEnd">8dip</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-w520dp-h220dp/layout.xml b/res/values-w520dp-h220dp-land/layout.xml
index 4f6bda4..f4d3c4f 100644
--- a/res/values-w520dp-h220dp/layout.xml
+++ b/res/values-w520dp-h220dp-land/layout.xml
@@ -20,4 +20,4 @@
     <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
+</resources>
diff --git a/res/values-w520dp-h220dp-land/styles.xml b/res/values-w520dp-h220dp-land/styles.xml
new file mode 100644
index 0000000..e90e530
--- /dev/null
+++ b/res/values-w520dp-h220dp-land/styles.xml
@@ -0,0 +1,95 @@
+<?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">36dip</item>
+        <item name="android:paddingEnd">36dip</item>
+        <item name="android:gravity">bottom</item>
+        <item name="minTextSize">28dip</item>
+        <item name="maxTextSize">28dip</item>
+        <item name="stepTextSize">8dip</item>
+    </style>
+
+    <style name="DisplayTextStyle.Result">
+        <item name="android:paddingTop">0dip</item>
+        <item name="android:paddingBottom">0dip</item>
+        <item name="android:paddingStart">36dip</item>
+        <item name="android:paddingEnd">36dip</item>
+        <item name="android:gravity">bottom</item>
+        <item name="android:textSize">28dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced">
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
+        <item name="android:textColor">@color/pad_button_advanced_text_color</item>
+        <item name="android:textSize">14dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">12dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric">
+        <item name="android:textSize">16dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator">
+        <item name="android:textSize">14dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">12dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Advanced">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">4</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</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">3</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Operator">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">2</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
+    </style>
+
+</resources>
diff --git a/res/values-w520dp-h500dp/layout.xml b/res/values-w520dp-h275dp-land/layout.xml
index b1babae..15b5b1b 100644
--- a/res/values-w520dp-h500dp/layout.xml
+++ b/res/values-w520dp-h275dp-land/layout.xml
@@ -20,4 +20,4 @@
     <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
+</resources>
diff --git a/res/values-w520dp-h275dp-land/styles.xml b/res/values-w520dp-h275dp-land/styles.xml
new file mode 100644
index 0000000..9d66a9b
--- /dev/null
+++ b/res/values-w520dp-h275dp-land/styles.xml
@@ -0,0 +1,93 @@
+<?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">2dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">36dip</item>
+        <item name="android:paddingEnd">36dip</item>
+        <item name="minTextSize">28dip</item>
+        <item name="maxTextSize">28dip</item>
+        <item name="stepTextSize">8dip</item>
+    </style>
+
+    <style name="DisplayTextStyle.Result">
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">16dip</item>
+        <item name="android:paddingStart">36dip</item>
+        <item name="android:paddingEnd">36dip</item>
+        <item name="android:textSize">28dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced">
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
+        <item name="android:textColor">@color/pad_button_advanced_text_color</item>
+        <item name="android:textSize">17dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">14dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric">
+        <item name="android:textSize">20dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Numeric.Equals">
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator">
+        <item name="android:textSize">17dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Operator.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">14dip</item>
+    </style>
+
+    <style name="PadLayoutStyle.Advanced">
+        <item name="android:layout_weight">5</item>
+        <item name="android:layout_width">0dip</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>
+    </style>
+
+    <style name="PadLayoutStyle.Numeric">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">5</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>
+    </style>
+
+    <style name="PadLayoutStyle.Operator">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">3</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>
+    </style>
+
+</resources>
diff --git a/res/values-w520dp-h275dp/layout.xml b/res/values-w520dp-h375dp-land/layout.xml
index cbb2d49..15b5b1b 100644
--- a/res/values-w520dp-h275dp/layout.xml
+++ b/res/values-w520dp-h375dp-land/layout.xml
@@ -18,6 +18,6 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w520dp-h220dp/styles.xml b/res/values-w520dp-h375dp-land/styles.xml
index 8e4a770..d89ea24 100644
--- a/res/values-w520dp-h220dp/styles.xml
+++ b/res/values-w520dp-h375dp-land/styles.xml
@@ -19,29 +19,31 @@
 
     <style name="DisplayTextStyle.Formula">
         <item name="android:paddingTop">2dip</item>
-        <item name="android:paddingBottom">6dip</item>
+        <item name="android:paddingBottom">10dip</item>
         <item name="android:paddingStart">36dip</item>
         <item name="android:paddingEnd">36dip</item>
-        <item name="android:textSize">24dip</item>
+        <item name="minTextSize">32dip</item>
+        <item name="maxTextSize">32dip</item>
+        <item name="stepTextSize">8dip</item>
     </style>
 
     <style name="DisplayTextStyle.Result">
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">12dip</item>
+        <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">24dip</item>
+        <item name="android:textSize">32dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
-        <item name="android:textSize">15dip</item>
+        <item name="android:textSize">20dip</item>
     </style>
 
     <style name="PadButtonStyle.Advanced.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">13dip</item>
+        <item name="android:textSize">17dip</item>
     </style>
 
     <style name="PadButtonStyle.Numeric">
@@ -58,36 +60,34 @@
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">13dip</item>
+        <item name="android:textSize">17dip</item>
     </style>
 
     <style name="PadLayoutStyle.Advanced">
+        <item name="android:layout_weight">5</item>
         <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">208</item>
-        <item name="android:paddingTop">4dip</item>
-        <item name="android:paddingBottom">4dip</item>
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:paddingEnd">8dip</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">12dip</item>
+        <item name="android:paddingEnd">12dip</item>
     </style>
 
     <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>
-        <item name="android:paddingEnd">8dip</item>
+        <item name="android:layout_weight">5</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">8dip</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">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:layout_weight">3</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">12dip</item>
         <item name="android:paddingEnd">12dip</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w520dp-h500dp-land/layout.xml b/res/values-w520dp-h500dp-land/layout.xml
new file mode 100644
index 0000000..15b5b1b
--- /dev/null
+++ b/res/values-w520dp-h500dp-land/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_3x5</item>
+    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
+</resources>
diff --git a/res/values-w396dp-h500dp/styles.xml b/res/values-w520dp-h500dp-land/styles.xml
index 8fde88e..883f6cd 100644
--- a/res/values-w396dp-h500dp/styles.xml
+++ b/res/values-w520dp-h500dp-land/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.
@@ -16,6 +16,7 @@
   -->
 
 <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>
@@ -50,7 +51,7 @@
     </style>
 
     <style name="PadButtonStyle.Numeric.Equals">
-        <item name="android:visibility">visible</item>
+        <item name="android:visibility">gone</item>
     </style>
 
     <style name="PadButtonStyle.Operator">
@@ -62,23 +63,31 @@
         <item name="android:textSize">20dip</item>
     </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:paddingBottom">8dip</item>
+        <item name="android:paddingStart">12dip</item>
+        <item name="android:paddingEnd">12dip</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:layout_weight">5</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">8dip</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:layout_weight">3</item>
         <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">24dip</item>
-        <item name="android:paddingStart">4dip</item>
-        <item name="android:paddingEnd">28dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">12dip</item>
+        <item name="android:paddingEnd">12dip</item>
     </style>
 
 </resources>
diff --git a/res/values-w520dp-h500dp/styles.xml b/res/values-w520dp-h500dp/styles.xml
deleted file mode 100644
index e9cc37d..0000000
--- a/res/values-w520dp-h500dp/styles.xml
+++ /dev/null
@@ -1,97 +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 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">48dip</item>
-        <item name="maxTextSize">72dip</item>
-        <item name="stepTextSize">8dip</item>
-    </style>
-
-    <style name="DisplayTextStyle.Result">
-        <item name="android:paddingTop">24dip</item>
-        <item name="android:paddingBottom">56dip</item>
-        <item name="android:paddingStart">44dip</item>
-        <item name="android:paddingEnd">44dip</item>
-        <item name="android:textSize">48dip</item>
-    </style>
-
-    <style name="PadButtonStyle.Advanced">
-        <item name="android:background">@drawable/pad_button_advanced_background</item>
-        <item name="android:textColor">@color/pad_button_advanced_text_color</item>
-        <item name="android:textSize">27dip</item>
-    </style>
-
-    <style name="PadButtonStyle.Advanced.Text">
-        <item name="android:textAllCaps">true</item>s
-        <item name="android:textSize">24dip</item>
-    </style>
-
-    <style name="PadButtonStyle.Numeric">
-        <item name="android:textSize">36dip</item>
-    </style>
-
-    <style name="PadButtonStyle.Numeric.Equals">
-        <item name="android:visibility">gone</item>
-    </style>
-
-    <style name="PadButtonStyle.Operator">
-        <item name="android:textSize">36dip</item>
-    </style>
-
-    <style name="PadButtonStyle.Operator.Text">
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">24dip</item>
-    </style>
-
-    <style name="PadLayoutStyle.Operator">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">20</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">24dip</item>
-        <item name="android:paddingStart">4dip</item>
-        <item name="android:paddingEnd">4dip</item>
-    </style>
-
-    <style name="PadLayoutStyle.Numeric">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">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-w520dp-h768dp-land/layout.xml b/res/values-w520dp-h768dp-land/layout.xml
index b1babae..15b5b1b 100644
--- a/res/values-w520dp-h768dp-land/layout.xml
+++ b/res/values-w520dp-h768dp-land/layout.xml
@@ -20,4 +20,4 @@
     <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
+</resources>
diff --git a/res/values-w520dp-h768dp-land/styles.xml b/res/values-w520dp-h768dp-land/styles.xml
index 712a07d..9fdf68a 100644
--- a/res/values-w520dp-h768dp-land/styles.xml
+++ b/res/values-w520dp-h768dp-land/styles.xml
@@ -15,7 +15,6 @@
   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">
@@ -64,34 +63,31 @@
         <item name="android:textSize">26dip</item>
     </style>
 
-    <style name="PadLayoutStyle.Operator">
+    <style name="PadLayoutStyle.Advanced">
+        <item name="android:layout_weight">5</item>
         <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>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingStart">12dip</item>
+        <item name="android:paddingEnd">12dip</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: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>
     </style>
 
-    <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">40</item>
+    <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">8dip</item>
-        <item name="android:paddingStart">16dip</item>
-        <item name="android:paddingEnd">16dip</item>
+        <item name="android:paddingBottom">24dip</item>
+        <item name="android:paddingStart">12dip</item>
+        <item name="android:paddingEnd">12dip</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w520dp-h768dp-port/layout.xml b/res/values-w520dp-h768dp-port/layout.xml
index 80633ce..98db0fe 100644
--- a/res/values-w520dp-h768dp-port/layout.xml
+++ b/res/values-w520dp-h768dp-port/layout.xml
@@ -20,4 +20,4 @@
     <item name="display" type="layout">@layout/display_two_line</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_5x3</item>
     <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-w520dp-h768dp-port/styles.xml b/res/values-w520dp-h768dp-port/styles.xml
index 8e1ba60..4d5e2db 100644
--- a/res/values-w520dp-h768dp-port/styles.xml
+++ b/res/values-w520dp-h768dp-port/styles.xml
@@ -75,7 +75,6 @@
     <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>
@@ -85,16 +84,10 @@
     <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="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
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 883aee6..4935103 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,24 +17,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/calculator_accent_color</item>
-        <item name="android:statusBarColor">@color/calculator_accent_color</item>
-        <item name="android:windowSoftInputMode">stateAlwaysHidden</item>
-    </style>
-
-    <style name="Theme.Calculator">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:layoutDirection">ltr</item>
-    </style>
-
-    <style name="Theme.Licenses">
-        <item name="android:title">@string/menu_licenses</item>
-    </style>
-
     <style name="DisplayTextStyle" parent="@android:style/Widget.Material.Light.TextView">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:cursorVisible">false</item>
@@ -66,9 +48,4 @@
         <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">wrap_content</item>
-    </style>
-
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 0000000..b8c7600
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,38 @@
+<?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>
+
+    <style name="Theme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/calculator_accent_color</item>
+        <item name="android:statusBarColor">@color/calculator_accent_color</item>
+        <item name="android:windowSoftInputMode">stateAlwaysHidden</item>
+    </style>
+
+    <style name="Theme.Calculator">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:layoutDirection">ltr</item>
+    </style>
+
+    <style name="Theme.Licenses">
+        <item name="android:title">@string/menu_licenses</item>
+    </style>
+
+</resources>