1 files changed, 41 insertions, 41 deletions
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index 34e9dbc..2f301e8 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -15,98 +15,98 @@
   limitations under the License.
   -->
 
-<GridLayout
+<android.support.v7.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:rowCount="4"
-    android:columnCount="3"
-    android:background="@color/pad_numeric_background_color">
+    android:background="@color/pad_numeric_background_color"
+    app:rowCount="4"
+    app:columnCount="3">
 
     <Button
         android:id="@+id/digit_7"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="0"
-        android:layout_column="0"
-        android:text="@string/digit_7" />
+        android:text="@string/digit_7"
+        app:layout_row="0"
+        app:layout_column="0" />
 
     <Button
         android:id="@+id/digit_8"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="0"
-        android:layout_column="1"
-        android:text="@string/digit_8" />
+        android:text="@string/digit_8"
+        app:layout_row="0"
+        app:layout_column="1" />
 
     <Button
         android:id="@+id/digit_9"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="0"
-        android:layout_column="2"
-        android:text="@string/digit_9" />
+        android:text="@string/digit_9"
+        app:layout_row="0"
+        app:layout_column="2" />
 
     <Button
         android:id="@+id/digit_4"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="1"
-        android:layout_column="0"
-        android:text="@string/digit_4" />
+        android:text="@string/digit_4"
+        app:layout_row="1"
+        app:layout_column="0" />
 
     <Button
         android:id="@+id/digit_5"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="1"
-        android:layout_column="1"
-        android:text="@string/digit_5" />
+        android:text="@string/digit_5"
+        app:layout_row="1"
+        app:layout_column="1" />
 
     <Button
         android:id="@+id/digit_6"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="1"
-        android:layout_column="2"
-        android:text="@string/digit_6" />
+        android:text="@string/digit_6"
+        app:layout_row="1"
+        app:layout_column="2" />
 
     <Button
         android:id="@+id/digit_1"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="2"
-        android:layout_column="0"
-        android:text="@string/digit_1" />
+        android:text="@string/digit_1"
+        app:layout_row="2"
+        app:layout_column="0" />
 
     <Button
         android:id="@+id/digit_2"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="2"
-        android:layout_column="1"
-        android:text="@string/digit_2" />
+        android:text="@string/digit_2"
+        app:layout_row="2"
+        app:layout_column="1" />
 
     <Button
         android:id="@+id/digit_3"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="2"
-        android:layout_column="2"
-        android:text="@string/digit_3" />
+        android:text="@string/digit_3"
+        app:layout_row="2"
+        app:layout_column="2" />
 
     <Button
         android:id="@+id/dec_point"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="3"
-        android:layout_column="0"
         android:contentDescription="@string/desc_dec_point"
-        android:text="@string/dec_point" />
+        app:layout_row="3"
+        app:layout_column="0" />
 
     <Button
         android:id="@+id/digit_0"
         style="@style/PadButtonStyle.Numeric"
-        android:layout_row="3"
-        android:layout_column="1"
-        android:text="@string/digit_0" />
+        android:text="@string/digit_0"
+        app:layout_row="3"
+        app:layout_column="1" />
 
     <Button
         android:id="@+id/eq"
         style="@style/PadButtonStyle.Numeric.Equals"
-        android:layout_row="3"
-        android:layout_column="2"
         android:contentDescription="@string/desc_eq"
-        android:text="@string/eq" />
+        android:text="@string/eq"
+        app:layout_row="3"
+        app:layout_column="2" />
 
-</GridLayout>
+</android.support.v7.widget.GridLayout>