From cc5a13db24f109e5babaec3e1930516733f0ccea Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 14 Mar 2023 19:04:08 +0530
Subject: [PATCH] Improve ui of calculator and fix issue in high dpi screens

---
 res/drawable/ic_del.xml                       |  19 +-
 res/layout-land/pad_advanced_3x5.xml          |  66 ++----
 res/layout/activity_calculator_land.xml       |   3 +-
 res/layout/activity_calculator_port.xml       |   3 +-
 .../activity_calculator_tablet_port.xml       |   3 +-
 res/layout/pad_advanced_3x5.xml               |  66 ++----
 res/layout/pad_main.xml                       | 191 ++++++++++++++++++
 res/layout/pad_numeric.xml                    | 112 ----------
 res/values-w230dp-h275dp/layout.xml           |   3 +-
 res/values-w230dp-h375dp/layout.xml           |   3 +-
 res/values-w230dp-h475dp-port/layout.xml      |   1 -
 res/values-w375dp-h220dp/layout.xml           |   3 +-
 res/values-w375dp-h275dp/layout.xml           |   3 +-
 res/values-w375dp-h375dp/layout.xml           |   3 +-
 res/values-w375dp-h500dp-port/layout.xml      |   1 -
 res/values-w375dp-h768dp-port/layout.xml      |   5 +-
 res/values-w375dp-h768dp-port/styles.xml      |   3 +-
 res/values-w520dp-h220dp-land/layout.xml      |   3 +-
 res/values-w520dp-h275dp-land/layout.xml      |   1 -
 res/values-w520dp-h375dp-land/layout.xml      |   1 -
 res/values-w520dp-h500dp-land/layout.xml      |   1 -
 res/values-w520dp-h768dp-land/layout.xml      |   1 -
 res/values-w520dp-h768dp-port/layout.xml      |   5 +-
 res/values-w520dp-h768dp-port/styles.xml      |   3 +-
 res/values/layout.xml                         |   3 +-
 res/values/styles.xml                         |  15 ++
 26 files changed, 272 insertions(+), 249 deletions(-)
 create mode 100644 res/layout/pad_main.xml
 delete mode 100644 res/layout/pad_numeric.xml

diff --git a/res/drawable/ic_del.xml b/res/drawable/ic_del.xml
index 14691140..716c62ea 100644
--- a/res/drawable/ic_del.xml
+++ b/res/drawable/ic_del.xml
@@ -14,16 +14,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="@color/calculator_accent_color"
-        android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41
-        L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21
-        H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5
-        H7L2.28,12L7,19H22V5Z" />
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88L0,12L5.41,20.11C5.77,20.64 6.31,21 7,21H22C23.1,21 24,20.1 24,19V5C24,3.9 23.1,3 22,3ZM22,19H7.07L2.4,12L7.06,5H22V19ZM10.41,17L14,13.41L17.59,17L19,15.59L15.41,12L19,8.41L17.59,7L14,10.59L10.41,7L9,8.41L12.59,12L9,15.59L10.41,17Z"
+      android:fillColor="@color/calculator_accent_color"/>
 </vector>
+
diff --git a/res/layout-land/pad_advanced_3x5.xml b/res/layout-land/pad_advanced_3x5.xml
index dfd283d5..c17548b0 100644
--- a/res/layout-land/pad_advanced_3x5.xml
+++ b/res/layout-land/pad_advanced_3x5.xml
@@ -21,12 +21,12 @@
     android:id="@+id/pad_advanced"
     style="@style/PadLayoutStyle.Advanced"
     android:background="@color/pad_advanced_background_color"
-    app:rowCount="5"
+    app:rowCount="4"
     app:columnCount="3">
 
     <com.android.calculator2.HapticButton
         android:id="@+id/toggle_inv"
-        style="@style/PadButtonStyle.Advanced.Text"
+        style="@style/PadButtonStyle.Advanced.Text.E"
         android:background="@drawable/pad_button_inverse_background"
         android:contentDescription="@string/desc_inv_off"
         android:text="@string/inv"
@@ -35,23 +35,15 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/toggle_mode"
-        style="@style/PadButtonStyle.Advanced.Text"
+        style="@style/PadButtonStyle.Advanced.Text.E"
         android:contentDescription="@string/desc_switch_deg"
         android:text="@string/mode_deg"
         app:layout_row="0"
         app:layout_column="1" />
 
-    <com.android.calculator2.HapticButton
-        android:id="@+id/op_pct"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_op_pct"
-        android:text="@string/op_pct"
-        app:layout_row="0"
-        app:layout_column="2" />
-
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_sin"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_sin"
         android:text="@string/fun_sin"
         app:layout_row="1"
@@ -59,7 +51,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_arcsin"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_arcsin"
         android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arcsin"
@@ -69,7 +61,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_cos"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_cos"
         android:text="@string/fun_cos"
         app:layout_row="1"
@@ -77,7 +69,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_arccos"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_arccos"
         android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arccos"
@@ -87,7 +79,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_tan"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_tan"
         android:text="@string/fun_tan"
         app:layout_row="1"
@@ -95,7 +87,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_arctan"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_arctan"
         android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arctan"
@@ -105,7 +97,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_ln"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_ln"
         android:text="@string/fun_ln"
         app:layout_row="2"
@@ -113,7 +105,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_exp"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_exp"
         android:fontFamily="sans-serif-medium"
         android:text="@string/fun_exp"
@@ -123,7 +115,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_log"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_log"
         android:text="@string/fun_log"
         app:layout_row="2"
@@ -131,7 +123,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/fun_10pow"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_fun_10pow"
         android:fontFamily="sans-serif-medium"
         android:text="@string/fun_10pow"
@@ -141,7 +133,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/op_fact"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_op_fact"
         android:text="@string/op_fact"
         app:layout_row="2"
@@ -149,7 +141,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/const_pi"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_const_pi"
         android:text="@string/const_pi"
         app:layout_row="3"
@@ -157,7 +149,7 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/const_e"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_const_e"
         android:text="@string/const_e"
         app:layout_row="3"
@@ -165,44 +157,28 @@
 
     <com.android.calculator2.HapticButton
         android:id="@+id/op_pow"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_op_pow"
         android:text="@string/op_pow"
         app:layout_row="3"
         app:layout_column="2" />
 
-    <com.android.calculator2.HapticButton
-        android:id="@+id/lparen"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_lparen"
-        android:text="@string/lparen"
-        app:layout_row="4"
-        app:layout_column="0" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/rparen"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_rparen"
-        android:text="@string/rparen"
-        app:layout_row="4"
-        app:layout_column="1" />
-
     <com.android.calculator2.HapticButton
         android:id="@+id/op_sqrt"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_op_sqrt"
         android:text="@string/op_sqrt"
-        app:layout_row="4"
+        app:layout_row="0"
         app:layout_column="2" />
 
     <com.android.calculator2.HapticButton
         android:id="@+id/op_sqr"
-        style="@style/PadButtonStyle.Advanced"
+        style="@style/PadButtonStyle.Advanced.E"
         android:contentDescription="@string/desc_op_sqr"
         android:fontFamily="sans-serif-medium"
         android:text="@string/op_sqr"
         android:visibility="gone"
-        app:layout_row="4"
+        app:layout_row="0"
         app:layout_column="2" />
 
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml
index 5a487e32..8fc54ed0 100644
--- a/res/layout/activity_calculator_land.xml
+++ b/res/layout/activity_calculator_land.xml
@@ -36,8 +36,7 @@
         android:layout_height="0dip"
         android:layout_weight="1">
 
-        <include layout="@layout/pad_numeric" />
-        <include layout="@layout/pad_operator" />
+        <include layout="@layout/pad_main" />
         <include layout="@layout/pad_advanced" />
 
     </LinearLayout>
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index fb62c53b..f935b964 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -39,8 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <include layout="@layout/pad_numeric" />
-            <include layout="@layout/pad_operator" />
+            <include layout="@layout/pad_main" />
 
         </LinearLayout>
 
diff --git a/res/layout/activity_calculator_tablet_port.xml b/res/layout/activity_calculator_tablet_port.xml
index a5cd80e6..57e93063 100644
--- a/res/layout/activity_calculator_tablet_port.xml
+++ b/res/layout/activity_calculator_tablet_port.xml
@@ -35,8 +35,7 @@
         android:layout_height="0dip"
         android:layout_weight="500">
 
-        <include layout="@layout/pad_numeric"/>
-        <include layout="@layout/pad_operator" />
+        <include layout="@layout/pad_main"/>
 
     </LinearLayout>
 
diff --git a/res/layout/pad_advanced_3x5.xml b/res/layout/pad_advanced_3x5.xml
index 4bdef5ff..c37057ee 100644
--- a/res/layout/pad_advanced_3x5.xml
+++ b/res/layout/pad_advanced_3x5.xml
@@ -32,12 +32,12 @@
     <androidx.gridlayout.widget.GridLayout
         android:id="@+id/pad_advanced"
         style="@style/PadLayoutStyle.Advanced"
-        app:rowCount="5"
+        app:rowCount="4"
         app:columnCount="3">
 
         <com.android.calculator2.HapticButton
             android:id="@+id/toggle_inv"
-            style="@style/PadButtonStyle.Advanced.Text"
+            style="@style/PadButtonStyle.Advanced.Text.E"
             android:background="@drawable/pad_button_inverse_background"
             android:contentDescription="@string/desc_inv_off"
             android:text="@string/inv"
@@ -46,23 +46,15 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/toggle_mode"
-            style="@style/PadButtonStyle.Advanced.Text"
+            style="@style/PadButtonStyle.Advanced.Text.E"
             android:contentDescription="@string/desc_switch_deg"
             android:text="@string/mode_deg"
             app:layout_row="0"
             app:layout_column="1" />
 
-        <com.android.calculator2.HapticButton
-            android:id="@+id/op_pct"
-            style="@style/PadButtonStyle.Advanced"
-            android:contentDescription="@string/desc_op_pct"
-            android:text="@string/op_pct"
-            app:layout_row="0"
-            app:layout_column="2" />
-
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_sin"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_sin"
             android:text="@string/fun_sin"
             app:layout_row="1"
@@ -70,7 +62,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_arcsin"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_arcsin"
             android:fontFamily="sans-serif-medium"
             android:text="@string/fun_arcsin"
@@ -80,7 +72,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_cos"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_cos"
             android:text="@string/fun_cos"
             app:layout_row="1"
@@ -88,7 +80,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_arccos"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_arccos"
             android:fontFamily="sans-serif-medium"
             android:text="@string/fun_arccos"
@@ -98,7 +90,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_tan"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_tan"
             android:text="@string/fun_tan"
             app:layout_row="1"
@@ -106,7 +98,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_arctan"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_arctan"
             android:fontFamily="sans-serif-medium"
             android:text="@string/fun_arctan"
@@ -116,7 +108,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_ln"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_ln"
             android:text="@string/fun_ln"
             app:layout_row="2"
@@ -124,7 +116,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_exp"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_exp"
             android:fontFamily="sans-serif-medium"
             android:text="@string/fun_exp"
@@ -134,7 +126,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_log"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_log"
             android:text="@string/fun_log"
             app:layout_row="2"
@@ -142,7 +134,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/fun_10pow"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_fun_10pow"
             android:fontFamily="sans-serif-medium"
             android:text="@string/fun_10pow"
@@ -152,7 +144,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/op_fact"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_op_fact"
             android:text="@string/op_fact"
             app:layout_row="2"
@@ -160,7 +152,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/const_pi"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_const_pi"
             android:text="@string/const_pi"
             app:layout_row="3"
@@ -168,7 +160,7 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/const_e"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_const_e"
             android:text="@string/const_e"
             app:layout_row="3"
@@ -176,44 +168,28 @@
 
         <com.android.calculator2.HapticButton
             android:id="@+id/op_pow"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_op_pow"
             android:text="@string/op_pow"
             app:layout_row="3"
             app:layout_column="2" />
 
-        <com.android.calculator2.HapticButton
-            android:id="@+id/lparen"
-            style="@style/PadButtonStyle.Advanced"
-            android:contentDescription="@string/desc_lparen"
-            android:text="@string/lparen"
-            app:layout_row="4"
-            app:layout_column="0" />
-
-        <com.android.calculator2.HapticButton
-            android:id="@+id/rparen"
-            style="@style/PadButtonStyle.Advanced"
-            android:contentDescription="@string/desc_rparen"
-            android:text="@string/rparen"
-            app:layout_row="4"
-            app:layout_column="1" />
-
         <com.android.calculator2.HapticButton
             android:id="@+id/op_sqrt"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_op_sqrt"
             android:text="@string/op_sqrt"
-            app:layout_row="4"
+            app:layout_row="0"
             app:layout_column="2" />
 
         <com.android.calculator2.HapticButton
             android:id="@+id/op_sqr"
-            style="@style/PadButtonStyle.Advanced"
+            style="@style/PadButtonStyle.Advanced.E"
             android:contentDescription="@string/desc_op_sqr"
             android:fontFamily="sans-serif-medium"
             android:text="@string/op_sqr"
             android:visibility="gone"
-            app:layout_row="4"
+            app:layout_row="0"
             app:layout_column="2" />
 
     </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_main.xml b/res/layout/pad_main.xml
new file mode 100644
index 00000000..14801e59
--- /dev/null
+++ b/res/layout/pad_main.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<androidx.gridlayout.widget.GridLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pad_numeric"
+    style="@style/PadLayoutStyle.Numeric"
+    android:background="@color/pad_numeric_background_color"
+    app:rowCount="5"
+    app:columnCount="4">
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_7"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_7"
+        app:layout_row="1"
+        app:layout_column="0" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_8"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_8"
+        app:layout_row="1"
+        app:layout_column="1" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_9"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_9"
+        app:layout_row="1"
+        app:layout_column="2" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_4"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_4"
+        app:layout_row="2"
+        app:layout_column="0" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_5"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_5"
+        app:layout_row="2"
+        app:layout_column="1" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_6"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_6"
+        app:layout_row="2"
+        app:layout_column="2" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_1"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_1"
+        app:layout_row="3"
+        app:layout_column="0" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_2"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_2"
+        app:layout_row="3"
+        app:layout_column="1" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_3"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_3"
+        app:layout_row="3"
+        app:layout_column="2" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/dec_point"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_dec_point"
+        app:layout_row="4"
+        app:layout_column="0" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/digit_0"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:text="@string/digit_0"
+        app:layout_row="4"
+        app:layout_column="1" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/eq"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_eq"
+        android:text="@string/eq"
+        app:layout_row="4"
+        app:layout_column="2" />
+
+    <com.android.calculator2.HapticImageButton
+        android:id="@+id/del"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_del"
+        android:src="@drawable/ic_del"
+        app:layout_row="0"
+        app:layout_column="3" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/clr"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_clr"
+        android:text="@string/clr"
+        android:textColor="@color/calculator_accent_color"
+        android:visibility="gone"
+        app:layout_row="0"
+        app:layout_column="3" />
+
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/op_div"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_op_div"
+        android:text="@string/op_div"
+        android:textColor="@color/calculator_accent_color"
+        app:layout_row="1"
+        app:layout_column="3" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/op_mul"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_op_mul"
+        android:text="@string/op_mul"
+        android:textColor="@color/calculator_accent_color"
+        app:layout_row="2"
+        app:layout_column="3" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/op_sub"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_op_sub"
+        android:text="@string/op_sub"
+        android:textColor="@color/calculator_accent_color"
+        app:layout_row="3"
+        app:layout_column="3" />
+
+    <com.android.calculator2.HapticButton
+        android:id="@+id/op_add"
+        style="@style/PadButtonStyle.Numeric.E"
+        android:contentDescription="@string/desc_op_add"
+        android:text="@string/op_add"
+        android:textColor="@color/calculator_accent_color"
+        app:layout_row="4"
+        app:layout_column="3" />
+
+    <com.android.calculator2.HapticButton
+            android:id="@+id/lparen"
+            style="@style/PadButtonStyle.Numeric.E"
+            android:contentDescription="@string/desc_lparen"
+            android:text="@string/lparen"
+            app:layout_row="0"
+            app:layout_column="0" />
+
+    <com.android.calculator2.HapticButton
+            android:id="@+id/rparen"
+            style="@style/PadButtonStyle.Numeric.E"
+            android:contentDescription="@string/desc_rparen"
+            android:text="@string/rparen"
+            app:layout_row="0"
+            app:layout_column="1" />
+
+    <com.android.calculator2.HapticButton
+            android:id="@+id/op_pct"
+            style="@style/PadButtonStyle.Numeric.E"
+            android:contentDescription="@string/desc_op_pct"
+            android:text="@string/op_pct"
+            app:layout_row="0"
+            app:layout_column="2" />
+
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
deleted file mode 100644
index cfe308b1..00000000
--- a/res/layout/pad_numeric.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2014 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<androidx.gridlayout.widget.GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/pad_numeric"
-    style="@style/PadLayoutStyle.Numeric"
-    android:background="@color/pad_numeric_background_color"
-    app:rowCount="4"
-    app:columnCount="3">
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_7"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_7"
-        app:layout_row="0"
-        app:layout_column="0" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_8"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_8"
-        app:layout_row="0"
-        app:layout_column="1" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_9"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_9"
-        app:layout_row="0"
-        app:layout_column="2" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_4"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_4"
-        app:layout_row="1"
-        app:layout_column="0" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_5"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_5"
-        app:layout_row="1"
-        app:layout_column="1" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_6"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_6"
-        app:layout_row="1"
-        app:layout_column="2" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_1"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_1"
-        app:layout_row="2"
-        app:layout_column="0" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_2"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_2"
-        app:layout_row="2"
-        app:layout_column="1" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_3"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_3"
-        app:layout_row="2"
-        app:layout_column="2" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/dec_point"
-        style="@style/PadButtonStyle.Numeric"
-        android:contentDescription="@string/desc_dec_point"
-        app:layout_row="3"
-        app:layout_column="0" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/digit_0"
-        style="@style/PadButtonStyle.Numeric"
-        android:text="@string/digit_0"
-        app:layout_row="3"
-        app:layout_column="1" />
-
-    <com.android.calculator2.HapticButton
-        android:id="@+id/eq"
-        style="@style/PadButtonStyle.Numeric.Equals"
-        android:contentDescription="@string/desc_eq"
-        android:text="@string/eq"
-        app:layout_row="3"
-        app:layout_column="2" />
-
-</androidx.gridlayout.widget.GridLayout>
diff --git a/res/values-w230dp-h275dp/layout.xml b/res/values-w230dp-h275dp/layout.xml
index f9a2d970..07752d7d 100644
--- a/res/values-w230dp-h275dp/layout.xml
+++ b/res/values-w230dp-h275dp/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w230dp-h375dp/layout.xml b/res/values-w230dp-h375dp/layout.xml
index f9a2d970..07752d7d 100644
--- a/res/values-w230dp-h375dp/layout.xml
+++ b/res/values-w230dp-h375dp/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w230dp-h475dp-port/layout.xml b/res/values-w230dp-h475dp-port/layout.xml
index 9f7bd6bb..07752d7d 100644
--- a/res/values-w230dp-h475dp-port/layout.xml
+++ b/res/values-w230dp-h475dp-port/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w375dp-h220dp/layout.xml b/res/values-w375dp-h220dp/layout.xml
index ac4cde83..611e2fa2 100644
--- a/res/values-w375dp-h220dp/layout.xml
+++ b/res/values-w375dp-h220dp/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_one_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w375dp-h275dp/layout.xml b/res/values-w375dp-h275dp/layout.xml
index 3890667a..07752d7d 100644
--- a/res/values-w375dp-h275dp/layout.xml
+++ b/res/values-w375dp-h275dp/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w375dp-h375dp/layout.xml b/res/values-w375dp-h375dp/layout.xml
index 3890667a..07752d7d 100644
--- a/res/values-w375dp-h375dp/layout.xml
+++ b/res/values-w375dp-h375dp/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w375dp-h500dp-port/layout.xml b/res/values-w375dp-h500dp-port/layout.xml
index 9f7bd6bb..07752d7d 100644
--- a/res/values-w375dp-h500dp-port/layout.xml
+++ b/res/values-w375dp-h500dp-port/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_two_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
     <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w375dp-h768dp-port/layout.xml b/res/values-w375dp-h768dp-port/layout.xml
index 98db0fee..07752d7d 100644
--- a/res/values-w375dp-h768dp-port/layout.xml
+++ b/res/values-w375dp-h768dp-port/layout.xml
@@ -16,8 +16,7 @@
   -->
 
 <resources>
-    <item name="activity_calculator" type="layout">@layout/activity_calculator_tablet_port</item>
+    <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_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>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w375dp-h768dp-port/styles.xml b/res/values-w375dp-h768dp-port/styles.xml
index 2c5ae357..b8caea0b 100644
--- a/res/values-w375dp-h768dp-port/styles.xml
+++ b/res/values-w375dp-h768dp-port/styles.xml
@@ -46,8 +46,7 @@
     </style>
 
     <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_height">0dip</item>
-        <item name="android:layout_weight">264</item>
+        <item name="android:elevation">4dip</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">16dip</item>
diff --git a/res/values-w520dp-h220dp-land/layout.xml b/res/values-w520dp-h220dp-land/layout.xml
index f4d3c4fb..06da6b28 100644
--- a/res/values-w520dp-h220dp-land/layout.xml
+++ b/res/values-w520dp-h220dp-land/layout.xml
@@ -18,6 +18,5 @@
 <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_operator" type="layout">@layout/pad_operator_two_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w520dp-h275dp-land/layout.xml b/res/values-w520dp-h275dp-land/layout.xml
index 15b5b1b5..630f75b0 100644
--- a/res/values-w520dp-h275dp-land/layout.xml
+++ b/res/values-w520dp-h275dp-land/layout.xml
@@ -19,5 +19,4 @@
     <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-w520dp-h375dp-land/layout.xml b/res/values-w520dp-h375dp-land/layout.xml
index 15b5b1b5..630f75b0 100644
--- a/res/values-w520dp-h375dp-land/layout.xml
+++ b/res/values-w520dp-h375dp-land/layout.xml
@@ -19,5 +19,4 @@
     <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-w520dp-h500dp-land/layout.xml b/res/values-w520dp-h500dp-land/layout.xml
index 15b5b1b5..630f75b0 100644
--- a/res/values-w520dp-h500dp-land/layout.xml
+++ b/res/values-w520dp-h500dp-land/layout.xml
@@ -19,5 +19,4 @@
     <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-w520dp-h768dp-land/layout.xml b/res/values-w520dp-h768dp-land/layout.xml
index 15b5b1b5..630f75b0 100644
--- a/res/values-w520dp-h768dp-land/layout.xml
+++ b/res/values-w520dp-h768dp-land/layout.xml
@@ -19,5 +19,4 @@
     <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-w520dp-h768dp-port/layout.xml b/res/values-w520dp-h768dp-port/layout.xml
index 98db0fee..07752d7d 100644
--- a/res/values-w520dp-h768dp-port/layout.xml
+++ b/res/values-w520dp-h768dp-port/layout.xml
@@ -16,8 +16,7 @@
   -->
 
 <resources>
-    <item name="activity_calculator" type="layout">@layout/activity_calculator_tablet_port</item>
+    <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_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>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values-w520dp-h768dp-port/styles.xml b/res/values-w520dp-h768dp-port/styles.xml
index 9136b508..5e0d541e 100644
--- a/res/values-w520dp-h768dp-port/styles.xml
+++ b/res/values-w520dp-h768dp-port/styles.xml
@@ -46,8 +46,7 @@
     </style>
 
     <style name="PadLayoutStyle.Advanced">
-        <item name="android:layout_height">0dip</item>
-        <item name="android:layout_weight">264</item>
+        <item name="android:elevation">4dip</item>
         <item name="android:paddingTop">8dip</item>
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">16dip</item>
diff --git a/res/values/layout.xml b/res/values/layout.xml
index 0e698d57..611e2fa2 100644
--- a/res/values/layout.xml
+++ b/res/values/layout.xml
@@ -18,6 +18,5 @@
 <resources>
     <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
     <item name="display" type="layout">@layout/display_one_line</item>
-    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
-    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x4</item>
+    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x5</item>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d8df617d..5472b4e0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -93,6 +93,21 @@
         <item name="android:textSize">16dip</item>
     </style>
 
+    <style name="PadButtonStyle.Numeric.E">
+        <item name="android:textSize">32dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced.E">
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
+        <item name="android:textColor">@color/pad_button_advanced_text_color</item>
+        <item name="android:textSize">20dip</item>
+    </style>
+
+    <style name="PadButtonStyle.Advanced.Text.E">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">17dip</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric.Equals">
         <item name="android:visibility">visible</item>
     </style>
-- 
GitLab