diff options
Diffstat (limited to 'res/layout/pad_operator_two_col.xml')
| -rw-r--r-- | res/layout/pad_operator_two_col.xml | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml index 0d559d1..e056ba5 100644 --- a/res/layout/pad_operator_two_col.xml +++ b/res/layout/pad_operator_two_col.xml @@ -15,69 +15,70 @@ 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_operator" style="@style/PadLayoutStyle.Operator" - android:rowCount="4" - android:columnCount="2" - android:background="@color/pad_operator_background_color"> + android:background="@color/pad_operator_background_color" + app:rowCount="4" + app:columnCount="2"> <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:text="@string/op_div" /> + android:text="@string/op_div" + app:layout_row="0" + app:layout_column="0" /> <Button android:id="@+id/del" style="@style/PadButtonStyle.Operator.Text" - android:layout_row="0" - android:layout_column="1" android:contentDescription="@string/desc_del" - android:text="@string/del" /> + android:text="@string/del" + app:layout_row="0" + app:layout_column="1" /> <Button android:id="@+id/clr" style="@style/PadButtonStyle.Operator.Text" - android:layout_row="0" - android:layout_column="1" android:contentDescription="@string/desc_clr" android:text="@string/clr" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="0" + app:layout_column="1" /> <Button android:id="@+id/op_mul" style="@style/PadButtonStyle.Operator" - android:layout_row="1" - android:layout_column="0" android:contentDescription="@string/op_mul" - android:text="@string/op_mul" /> + android:text="@string/op_mul" + app:layout_row="1" + app:layout_column="0" /> <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:text="@string/op_sub" /> + android:text="@string/op_sub" + app:layout_row="2" + app:layout_column="0" /> <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:text="@string/op_add" /> + android:text="@string/op_add" + app:layout_row="3" + app:layout_column="0" /> <Button android:id="@+id/eq" style="@style/PadButtonStyle.Operator" - android:layout_row="3" - android:layout_column="1" android:contentDescription="@string/desc_eq" - android:text="@string/eq" /> + android:text="@string/eq" + app:layout_row="3" + app:layout_column="1" /> -</GridLayout> +</android.support.v7.widget.GridLayout> |