am e2711cbb: Update advanced pad layout

* commit 'e2711cbb1569ab6c7a7c4506505ec403286d5ab4':
  Update advanced pad layout

14 files changed, 279 insertions, 146 deletions

diff --git a/res/layout/display.xml b/res/layout/display.xml
index d50d09f..56b0e6b 100644
--- a/res/layout/display.xml
+++ b/res/layout/display.xml
@@ -29,7 +29,7 @@
         android:layout_height="?android:attr/actionBarSize">
 
        <TextView
-            android:id="@+id/deg_rad"
+            android:id="@+id/mode"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-medium"
diff --git a/res/layout/pad_advanced.xml b/res/layout/pad_advanced.xml
index aeabdc4..bd2f30a 100644
--- a/res/layout/pad_advanced.xml
+++ b/res/layout/pad_advanced.xml
@@ -15,122 +15,159 @@
   limitations under the License.
   -->
 
-<com.android.calculator2.CalculatorPadLayout
+<GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pad_advanced"
     style="@style/PadLayoutStyle.Advanced"
+    android:rowCount="5"
+    android:columnCount="3"
     android:background="@color/pad_advanced_background_color">
 
     <Button
-        android:id="@+id/fun_sin"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_fun_sin"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_sin" />
+        android:id="@+id/toggle_inv"
+        style="@style/PadButtonStyle.Advanced.Text"
+        android:layout_row="0"
+        android:layout_column="0"
+        android:contentDescription="@string/desc_inv_off"
+        android:text="@string/inv" />
 
     <Button
-        android:id="@+id/fun_cos"
+        android:id="@+id/toggle_mode"
+        style="@style/PadButtonStyle.Advanced.Text"
+        android:layout_row="0"
+        android:layout_column="1"
+        android:contentDescription="@string/desc_switch_deg"
+        android:text="@string/mode_deg" />
+
+    <Button
+        android:id="@+id/op_pct"
         style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_fun_cos"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_cos" />
+        android:layout_row="0"
+        android:layout_column="2"
+        android:contentDescription="@string/desc_op_pct"
+        android:text="@string/op_pct" />
 
     <Button
-        android:id="@+id/fun_tan"
+        android:id="@+id/fun_sin"
         style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_fun_tan"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_tan" />
+        android:layout_row="1"
+        android:layout_column="0"
+        android:contentDescription="@string/desc_fun_sin"
+        android:text="@string/fun_sin" />
 
     <Button
         android:id="@+id/fun_arcsin"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="0"
         android:contentDescription="@string/desc_fun_arcsin"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_arcsin" />
+        android:text="@string/fun_arcsin"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/fun_cos"
+        style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="1"
+        android:contentDescription="@string/desc_fun_cos"
+        android:text="@string/fun_cos" />
 
     <Button
         android:id="@+id/fun_arccos"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="1"
         android:contentDescription="@string/desc_fun_arccos"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_arccos" />
+        android:text="@string/fun_arccos"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/fun_tan"
+        style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="2"
+        android:contentDescription="@string/desc_fun_tan"
+        android:text="@string/fun_tan" />
 
     <Button
         android:id="@+id/fun_arctan"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="2"
         android:contentDescription="@string/desc_fun_arctan"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_arctan" />
+        android:text="@string/fun_arctan"
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/fun_ln"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="0"
         android:contentDescription="@string/desc_fun_ln"
-        android:onClick="onButtonClick"
         android:text="@string/fun_ln" />
 
     <Button
         android:id="@+id/fun_log"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="1"
         android:contentDescription="@string/desc_fun_log"
-        android:onClick="onButtonClick"
         android:text="@string/fun_log" />
 
     <Button
         android:id="@+id/op_fact"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="2"
         android:contentDescription="@string/desc_op_fact"
-        android:onClick="onButtonClick"
         android:text="@string/op_fact" />
 
     <Button
         android:id="@+id/const_pi"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="3"
+        android:layout_column="0"
         android:contentDescription="@string/desc_const_pi"
-        android:onClick="onButtonClick"
         android:text="@string/const_pi" />
 
     <Button
         android:id="@+id/const_e"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="3"
+        android:layout_column="1"
         android:contentDescription="@string/desc_const_e"
-        android:onClick="onButtonClick"
         android:text="@string/const_e" />
 
     <Button
         android:id="@+id/op_pow"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="3"
+        android:layout_column="2"
         android:contentDescription="@string/desc_op_pow"
-        android:onClick="onButtonClick"
         android:text="@string/op_pow" />
 
     <Button
         android:id="@+id/lparen"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="4"
+        android:layout_column="0"
         android:contentDescription="@string/desc_lparen"
-        android:onClick="onButtonClick"
         android:text="@string/lparen" />
 
     <Button
         android:id="@+id/rparen"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="4"
+        android:layout_column="1"
         android:contentDescription="@string/desc_rparen"
-        android:onClick="onButtonClick"
         android:text="@string/rparen" />
 
     <Button
         android:id="@+id/op_sqrt"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="4"
+        android:layout_column="2"
         android:contentDescription="@string/desc_op_sqrt"
-        android:onClick="onButtonClick"
         android:text="@string/op_sqrt" />
 
-    <Button
-        android:id="@+id/mode_deg_rad"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_mode_rad"
-        android:onClick="onButtonClick"
-        android:textAllCaps="true" />
-
-</com.android.calculator2.CalculatorPadLayout>
+</GridLayout>
diff --git a/res/layout/pad_advanced_tablet_port.xml b/res/layout/pad_advanced_tablet_port.xml
index 6b9b03f..00b0a70 100644
--- a/res/layout/pad_advanced_tablet_port.xml
+++ b/res/layout/pad_advanced_tablet_port.xml
@@ -15,122 +15,159 @@
   limitations under the License.
   -->
 
-<com.android.calculator2.CalculatorPadLayout
+<GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pad_advanced"
     style="@style/PadLayoutStyle.Advanced"
+    android:rowCount="3"
+    android:columnCount="5"
     android:background="@color/pad_advanced_background_color">
 
     <Button
+        android:id="@+id/toggle_inv"
+        style="@style/PadButtonStyle.Advanced.Text"
+        android:layout_row="0"
+        android:layout_column="0"
+        android:contentDescription="@string/desc_inv_off"
+        android:text="@string/inv" />
+
+    <Button
+        android:id="@+id/toggle_mode"
+        style="@style/PadButtonStyle.Advanced.Text"
+        android:layout_row="0"
+        android:layout_column="1"
+        android:contentDescription="@string/desc_switch_deg"
+        android:text="@string/mode_deg" />
+
+    <Button
         android:id="@+id/fun_sin"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="0"
+        android:layout_column="2"
         android:contentDescription="@string/desc_fun_sin"
-        android:onClick="onButtonClick"
         android:text="@string/fun_sin" />
 
     <Button
+        android:id="@+id/fun_arcsin"
+        style="@style/PadButtonStyle.Advanced"
+        android:layout_row="0"
+        android:layout_column="2"
+        android:contentDescription="@string/desc_fun_arcsin"
+        android:text="@string/fun_arcsin"
+        android:visibility="gone" />
+
+    <Button
         android:id="@+id/fun_cos"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="0"
+        android:layout_column="3"
         android:contentDescription="@string/desc_fun_cos"
-        android:onClick="onButtonClick"
         android:text="@string/fun_cos" />
 
     <Button
+        android:id="@+id/fun_arccos"
+        style="@style/PadButtonStyle.Advanced"
+        android:layout_row="0"
+        android:layout_column="3"
+        android:contentDescription="@string/desc_fun_arccos"
+        android:text="@string/fun_arccos"
+        android:visibility="gone" />
+
+    <Button
         android:id="@+id/fun_tan"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="0"
+        android:layout_column="4"
         android:contentDescription="@string/desc_fun_tan"
-        android:onClick="onButtonClick"
         android:text="@string/fun_tan" />
 
     <Button
+        android:id="@+id/fun_arctan"
+        style="@style/PadButtonStyle.Advanced"
+        android:layout_row="0"
+        android:layout_column="4"
+        android:contentDescription="@string/desc_fun_arctan"
+        android:text="@string/fun_arctan"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/op_pct"
+        style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="0"
+        android:contentDescription="@string/desc_op_pct"
+        android:text="@string/op_pct" />
+
+    <Button
         android:id="@+id/fun_ln"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="1"
         android:contentDescription="@string/desc_fun_ln"
-        android:onClick="onButtonClick"
         android:text="@string/fun_ln" />
 
     <Button
         android:id="@+id/fun_log"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="2"
         android:contentDescription="@string/desc_fun_log"
-        android:onClick="onButtonClick"
         android:text="@string/fun_log" />
 
     <Button
         android:id="@+id/op_fact"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="1"
+        android:layout_column="3"
         android:contentDescription="@string/desc_op_fact"
-        android:onClick="onButtonClick"
         android:text="@string/op_fact" />
 
     <Button
-        android:id="@+id/fun_arcsin"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_fun_arcsin"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_arcsin" />
-
-    <Button
-        android:id="@+id/fun_arccos"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_fun_arccos"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_arccos" />
-
-    <Button
-        android:id="@+id/fun_arctan"
+        android:id="@+id/op_pow"
         style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_fun_arctan"
-        android:onClick="onButtonClick"
-        android:text="@string/fun_arctan" />
+        android:layout_row="1"
+        android:layout_column="4"
+        android:contentDescription="@string/desc_op_pow"
+        android:text="@string/op_pow" />
 
     <Button
         android:id="@+id/const_pi"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="0"
         android:contentDescription="@string/desc_const_pi"
-        android:onClick="onButtonClick"
         android:text="@string/const_pi" />
 
     <Button
         android:id="@+id/const_e"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="1"
         android:contentDescription="@string/desc_const_e"
-        android:onClick="onButtonClick"
         android:text="@string/const_e" />
 
     <Button
-        android:id="@+id/op_pow"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_op_pow"
-        android:onClick="onButtonClick"
-        android:text="@string/op_pow" />
-
-    <Button
         android:id="@+id/lparen"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="2"
         android:contentDescription="@string/desc_lparen"
-        android:onClick="onButtonClick"
         android:text="@string/lparen" />
 
     <Button
         android:id="@+id/rparen"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="3"
         android:contentDescription="@string/desc_rparen"
-        android:onClick="onButtonClick"
         android:text="@string/rparen" />
 
     <Button
         android:id="@+id/op_sqrt"
         style="@style/PadButtonStyle.Advanced"
+        android:layout_row="2"
+        android:layout_column="4"
         android:contentDescription="@string/desc_op_sqrt"
-        android:onClick="onButtonClick"
         android:text="@string/op_sqrt" />
 
-    <Button
-        android:id="@+id/mode_deg_rad"
-        style="@style/PadButtonStyle.Advanced"
-        android:contentDescription="@string/desc_mode_rad"
-        android:onClick="onButtonClick"
-        android:textAllCaps="true" />
-
-</com.android.calculator2.CalculatorPadLayout>
+</GridLayout>
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index c03f58b..6e9251b 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -15,85 +15,97 @@
   limitations under the License.
   -->
 
-<com.android.calculator2.CalculatorPadLayout
+<GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pad_numeric"
     style="@style/PadLayoutStyle.Numeric"
-    android:background="@color/pad_numeric_background_color"
+    android:rowCount="4"
     android:columnCount="3"
-    android:rowCount="4">
+    android:background="@color/pad_numeric_background_color">
 
     <Button
         android:id="@+id/digit_7"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="0"
+        android:layout_column="0"
         android:text="@string/digit_7" />
 
     <Button
         android:id="@+id/digit_8"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="0"
+        android:layout_column="1"
         android:text="@string/digit_8" />
 
     <Button
         android:id="@+id/digit_9"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="0"
+        android:layout_column="2"
         android:text="@string/digit_9" />
 
     <Button
         android:id="@+id/digit_4"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="1"
+        android:layout_column="0"
         android:text="@string/digit_4" />
 
     <Button
         android:id="@+id/digit_5"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="1"
+        android:layout_column="1"
         android:text="@string/digit_5" />
 
     <Button
         android:id="@+id/digit_6"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="1"
+        android:layout_column="2"
         android:text="@string/digit_6" />
 
     <Button
         android:id="@+id/digit_1"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="2"
+        android:layout_column="0"
         android:text="@string/digit_1" />
 
     <Button
         android:id="@+id/digit_2"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="2"
+        android:layout_column="1"
         android:text="@string/digit_2" />
 
     <Button
         android:id="@+id/digit_3"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="2"
+        android:layout_column="2"
         android:text="@string/digit_3" />
 
     <Button
         android:id="@+id/dec_point"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="3"
+        android:layout_column="0"
         android:text="@string/dec_point" />
 
     <Button
         android:id="@+id/digit_0"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
+        android:layout_row="3"
+        android:layout_column="1"
         android:text="@string/digit_0" />
 
     <Button
         android:id="@+id/eq"
         style="@style/PadButtonStyle.Numeric.Equals"
+        android:layout_row="3"
+        android:layout_column="2"
         android:contentDescription="@string/desc_eq"
-        android:onClick="onButtonClick"
         android:text="@string/eq" />
 
-</com.android.calculator2.CalculatorPadLayout>
+</GridLayout>
diff --git a/res/layout/pad_operator_one_col.xml b/res/layout/pad_operator_one_col.xml
index a794f72..1323b2c 100644
--- a/res/layout/pad_operator_one_col.xml
+++ b/res/layout/pad_operator_one_col.xml
@@ -15,55 +15,62 @@
   limitations under the License.
   -->
 
-<com.android.calculator2.CalculatorPadLayout
+<GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pad_operator"
     style="@style/PadLayoutStyle.Operator"
-    android:background="@color/pad_operator_background_color"
+    android:rowCount="5"
     android:columnCount="1"
-    android:rowCount="5">
+    android:background="@color/pad_operator_background_color">
 
     <Button
         android:id="@+id/del"
         style="@style/PadButtonStyle.Operator.Text"
+        android:layout_row="0"
+        android:layout_column="0"
         android:contentDescription="@string/desc_del"
-        android:onClick="onButtonClick"
         android:text="@string/del" />
 
     <Button
         android:id="@+id/clr"
         style="@style/PadButtonStyle.Operator.Text"
+        android:layout_row="0"
+        android:layout_column="0"
         android:contentDescription="@string/desc_clr"
-        android:onClick="onButtonClick"
         android:text="@string/clr"
         android:visibility="gone" />
 
+
     <Button
         android:id="@+id/op_div"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="1"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_div"
-        android:onClick="onButtonClick"
         android:text="@string/op_div" />
 
     <Button
         android:id="@+id/op_mul"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="2"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_mul"
-        android:onClick="onButtonClick"
         android:text="@string/op_mul" />
 
     <Button
         android:id="@+id/op_sub"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="3"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_sub"
-        android:onClick="onButtonClick"
         android:text="@string/op_sub" />
 
     <Button
         android:id="@+id/op_add"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="4"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_add"
-        android:onClick="onButtonClick"
         android:text="@string/op_add" />
 
-</com.android.calculator2.CalculatorPadLayout>
+</GridLayout>
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml
index 6009e89..0d559d1 100644
--- a/res/layout/pad_operator_two_col.xml
+++ b/res/layout/pad_operator_two_col.xml
@@ -15,66 +15,69 @@
   limitations under the License.
   -->
 
-<com.android.calculator2.CalculatorPadLayout
+<GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pad_operator"
     style="@style/PadLayoutStyle.Operator"
-    android:background="@color/pad_operator_background_color"
+    android:rowCount="4"
     android:columnCount="2"
-    android:rowCount="4">
+    android:background="@color/pad_operator_background_color">
 
     <Button
         android:id="@+id/op_div"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="0"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_div"
-        android:onClick="onButtonClick"
         android:text="@string/op_div" />
 
     <Button
         android:id="@+id/del"
         style="@style/PadButtonStyle.Operator.Text"
+        android:layout_row="0"
+        android:layout_column="1"
         android:contentDescription="@string/desc_del"
-        android:onClick="onButtonClick"
         android:text="@string/del" />
 
     <Button
         android:id="@+id/clr"
         style="@style/PadButtonStyle.Operator.Text"
+        android:layout_row="0"
+        android:layout_column="1"
         android:contentDescription="@string/desc_clr"
-        android:onClick="onButtonClick"
         android:text="@string/clr"
         android:visibility="gone" />
 
     <Button
         android:id="@+id/op_mul"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="1"
+        android:layout_column="0"
         android:contentDescription="@string/op_mul"
-        android:onClick="onButtonClick"
         android:text="@string/op_mul" />
 
-    <Space style="@style/PadButtonStyle.Operator" />
-
     <Button
         android:id="@+id/op_sub"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="2"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_sub"
-        android:onClick="onButtonClick"
         android:text="@string/op_sub" />
 
-    <Space style="@style/PadButtonStyle.Operator" />
-
     <Button
         android:id="@+id/op_add"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="3"
+        android:layout_column="0"
         android:contentDescription="@string/desc_op_add"
-        android:onClick="onButtonClick"
         android:text="@string/op_add" />
 
     <Button
         android:id="@+id/eq"
         style="@style/PadButtonStyle.Operator"
+        android:layout_row="3"
+        android:layout_column="1"
         android:contentDescription="@string/desc_eq"
-        android:onClick="onButtonClick"
         android:text="@string/eq" />
 
-</com.android.calculator2.CalculatorPadLayout>
+</GridLayout>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 828d9ac..bbda604 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -44,6 +44,11 @@
         <item name="android:textSize">15sp</item>
     </style>
 
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric">
         <item name="android:layout_margin">4dip</item>
         <item name="android:textSize">23sp</item>
@@ -63,7 +68,7 @@
 
     <style name="PadButtonStyle.Operator.Text">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">13sp</item>
     </style>
 
     <style name="PadLayoutStyle.Advanced">
@@ -73,8 +78,6 @@
         <item name="android:paddingBottom">4dip</item>
         <item name="android:paddingStart">8dip</item>
         <item name="android:paddingEnd">8dip</item>
-        <item name="android:columnCount">3</item>
-        <item name="android:rowCount">5</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index 3a7ad3e..a3b1867 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -43,6 +43,11 @@
         <item name="android:textSize">20sp</item>
     </style>
 
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">17sp</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric">
         <item name="android:layout_margin">4dip</item>
         <item name="android:textSize">32sp</item>
@@ -68,8 +73,6 @@
         <item name="android:paddingBottom">20dip</item>
         <item name="android:paddingStart">20dip</item>
         <item name="android:paddingEnd">20dip</item>
-        <item name="android:columnCount">3</item>
-        <item name="android:rowCount">5</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index e97f2ab..603a392 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -41,6 +41,11 @@
         <item name="android:textSize">27sp</item>
     </style>
 
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric">
         <item name="android:layout_margin">6dip</item>
         <item name="android:textSize">36sp</item>
@@ -67,8 +72,6 @@
         <item name="android:paddingBottom">10dip</item>
         <item name="android:paddingStart">18dip</item>
         <item name="android:paddingEnd">22dip</item>
-        <item name="android:columnCount">3</item>
-        <item name="android:rowCount">5</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index 9cd76ce..efb1033 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -47,6 +47,11 @@
         <item name="android:textSize">27sp</item>
     </style>
 
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric">
         <item name="android:layout_margin">8dip</item>
         <item name="android:textSize">36sp</item>
@@ -76,8 +81,6 @@
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">16dip</item>
         <item name="android:paddingEnd">16dip</item>
-        <item name="android:columnCount">6</item>
-        <item name="android:rowCount">3</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw800dp-land/styles.xml
index 7952971..807f568 100644
--- a/res/values-sw800dp-land/styles.xml
+++ b/res/values-sw800dp-land/styles.xml
@@ -43,6 +43,11 @@
         <item name="android:textSize">36sp</item>
     </style>
 
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">32sp</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric">
         <item name="android:layout_margin">6dip</item>
         <item name="android:textSize">48sp</item>
@@ -69,8 +74,6 @@
         <item name="android:paddingBottom">10dip</item>
         <item name="android:paddingStart">18dip</item>
         <item name="android:paddingEnd">22dip</item>
-        <item name="android:columnCount">3</item>
-        <item name="android:rowCount">5</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml
index bca0b13..8ce7a12 100644
--- a/res/values-sw800dp-port/styles.xml
+++ b/res/values-sw800dp-port/styles.xml
@@ -46,6 +46,11 @@
         <item name="android:textSize">36sp</item>
     </style>
 
+    <style name="PadButtonStyle.Advanced.Text">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">32sp</item>
+    </style>
+
     <style name="PadButtonStyle.Numeric">
         <item name="android:layout_margin">8dip</item>
         <item name="android:textSize">48sp</item>
@@ -75,8 +80,6 @@
         <item name="android:paddingBottom">8dip</item>
         <item name="android:paddingStart">16dip</item>
         <item name="android:paddingEnd">16dip</item>
-        <item name="android:columnCount">6</item>
-        <item name="android:rowCount">3</item>
     </style>
 
     <style name="PadLayoutStyle.Numeric">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1cd7910..3dad1c0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -69,6 +69,8 @@
     <string name="op_fact" translatable="false">!</string>
     <!-- Multiply operator (e.g. "1 × 2"). [CHAR_LIMIT=1] -->
     <string name="op_mul" translatable="false">×</string>
+    <!-- Percent operator (e.g. "25%"). [CHAR_LIMIT=1] -->
+    <string name="op_pct" translatable="false">%</string>
     <!-- Power operator (e.g. "1 ^ 2"). [CHAR_LIMIT=1] -->
     <string name="op_pow" translatable="false">^</string>
     <!-- Square root operator (e.g. "√1"). [CHAR_LIMIT=1] -->
@@ -104,7 +106,8 @@
     <string name="clr">clr</string>
     <!-- Delete button to remove last entered token. [CHAR_LIMIT=4] -->
     <string name="del">del</string>
-
+    <!-- Toggle button to show/hide inverse functions. [CHAR_LIMIT=4] -->
+    <string name="inv" translatable="false">inv</string>
 
     <!-- Content description for 'e' button. [CHAR_LIMIT=NONE] -->
     <string name="desc_const_e">Euler\'s number</string>
@@ -144,23 +147,35 @@
     <string name="desc_op_fact">factorial</string>
     <!-- Content description for '×' button. [CHAR_LIMIT=NONE] -->
     <string name="desc_op_mul">times</string>
+    <!-- Content description for '%' button. [CHAR_LIMIT=NONE] -->
+    <string name="desc_op_pct">percent</string>
     <!-- Content description for '^' button. [CHAR_LIMIT=NONE] -->
     <string name="desc_op_pow">power</string>
     <!-- Content description for '√' button. [CHAR_LIMIT=NONE] -->
     <string name="desc_op_sqrt">square root</string>
-    <!-- Content description for sitch to radian button. [CHAR_LIMIT=NONE] -->
-    <string name="desc_mode_rad">switch to radians</string>
-    <!-- Content description for switch to degree button. [CHAR_LIMIT=NONE] -->
-    <string name="desc_mode_deg">switch to degrees</string>
     <!-- Content description for '-' button. [CHAR_LIMIT=NONE] -->
     <string name="desc_op_sub">minus</string>
 
+    <!-- Content description for degree mode. [CHAR_LIMIT=NONE] -->
+    <string name="desc_mode_deg">degree mode</string>
+    <!-- Content description for radian mode. [CHAR_LIMIT=NONE] -->
+    <string name="desc_mode_rad">radian mode</string>
+
+    <!-- Content description for switch to degree button. [CHAR_LIMIT=NONE] -->
+    <string name="desc_switch_deg">switch to degrees</string>
+    <!-- Content description for switch to radian button. [CHAR_LIMIT=NONE] -->
+    <string name="desc_switch_rad">switch to radians</string>
+
+    <!-- Content description for '=' button. [CHAR_LIMIT=NONE] -->
+    <string name="desc_eq">equals</string>
     <!-- Content description for "clr" button. [CHAR_LIMIT=NONE] -->
     <string name="desc_clr">clear</string>
     <!-- Content description for "del" button. [CHAR_LIMIT=NONE] -->
     <string name="desc_del">delete</string>
-    <!-- Content description for '=' button. [CHAR_LIMIT=NONE] -->
-    <string name="desc_eq">equals</string>
+    <!-- Content description for "inv" button to show inverse functions. [CHAR_LIMIT=NONE] -->
+    <string name="desc_inv_off">show inverse functions</string>
+    <!-- Content description for "inv" button to hide inverse functions. [CHAR_LIMIT=NONE] -->
+    <string name="desc_inv_on">hide inverse functions</string>
 
     <!-- Error displayed when expression evaluates to an undefined result. [CHAR_LIMIT=16] -->
     <string name="error_nan">Not a number</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c88391e..ed77ea9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -43,14 +43,18 @@
     </style>
 
     <style name="PadButtonStyle" parent="@android:style/Widget.Material.Light.Button.Borderless">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">0dip</item>
+        <item name="android:layout_rowWeight">1</item>
+        <item name="android:layout_columnWeight">1</item>
+        <item name="android:layout_gravity">fill</item>
         <item name="android:background">@drawable/pad_button_background</item>
         <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:gravity">center</item>
         <item name="android:includeFontPadding">false</item>
         <item name="android:minWidth">0dip</item>
         <item name="android:minHeight">0dip</item>
+        <item name="android:onClick">onButtonClick</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textColor">@color/pad_button_text_color</item>
     </style>