diff options
Diffstat (limited to 'res/layout/pad_advanced_5x3.xml')
| -rw-r--r-- | res/layout/pad_advanced_5x3.xml | 137 |
1 files changed, 69 insertions, 68 deletions
diff --git a/res/layout/pad_advanced_5x3.xml b/res/layout/pad_advanced_5x3.xml index b8de7fd..95a0fc1 100644 --- a/res/layout/pad_advanced_5x3.xml +++ b/res/layout/pad_advanced_5x3.xml @@ -15,193 +15,194 @@ 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_advanced" style="@style/PadLayoutStyle.Advanced" - android:rowCount="3" - android:columnCount="5" - android:background="@color/pad_advanced_background_color"> + android:background="@color/pad_advanced_background_color" + app:rowCount="3" + app:columnCount="5"> <Button android:id="@+id/toggle_inv" style="@style/PadButtonStyle.Advanced.Text" - android:layout_row="0" - android:layout_column="0" android:background="@drawable/pad_button_inverse_background" android:contentDescription="@string/desc_inv_off" - android:text="@string/inv" /> + android:text="@string/inv" + app:layout_row="0" + app:layout_column="0" /> <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" /> + android:text="@string/mode_deg" + app:layout_row="0" + app:layout_column="1" /> <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:text="@string/fun_sin" /> + android:text="@string/fun_sin" + app:layout_row="0" + app:layout_column="2" /> <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:fontFamily="sans-serif-medium" android:text="@string/fun_arcsin" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="0" + app:layout_column="2" /> <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:text="@string/fun_cos" /> + android:text="@string/fun_cos" + app:layout_row="0" + app:layout_column="3" /> <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:fontFamily="sans-serif-medium" android:text="@string/fun_arccos" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="0" + app:layout_column="3" /> <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:text="@string/fun_tan" /> + android:text="@string/fun_tan" + app:layout_row="0" + app:layout_column="4" /> <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:fontFamily="sans-serif-medium" android:text="@string/fun_arctan" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="0" + app:layout_column="4" /> <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" /> + android:text="@string/op_pct" + app:layout_row="1" + app:layout_column="0" /> <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:text="@string/fun_ln" /> + android:text="@string/fun_ln" + app:layout_row="1" + app:layout_column="1" /> <Button android:id="@+id/fun_exp" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="1" android:contentDescription="@string/desc_fun_exp" android:fontFamily="sans-serif-medium" android:text="@string/fun_exp" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="1" + app:layout_column="1" /> <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:text="@string/fun_log" /> + android:text="@string/fun_log" + app:layout_row="1" + app:layout_column="2" /> <Button android:id="@+id/fun_10pow" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="2" android:contentDescription="@string/desc_fun_10pow" android:fontFamily="sans-serif-medium" android:text="@string/fun_10pow" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="1" + app:layout_column="2" /> <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:text="@string/op_fact" /> + android:text="@string/op_fact" + app:layout_row="1" + app:layout_column="3" /> <Button android:id="@+id/op_pow" style="@style/PadButtonStyle.Advanced" - android:layout_row="1" - android:layout_column="4" android:contentDescription="@string/desc_op_pow" - android:text="@string/op_pow" /> + android:text="@string/op_pow" + app:layout_row="1" + app:layout_column="4" /> <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:text="@string/const_pi" /> + android:text="@string/const_pi" + app:layout_row="2" + app:layout_column="0" /> <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:text="@string/const_e" /> + android:text="@string/const_e" + app:layout_row="2" + app:layout_column="1" /> <Button android:id="@+id/lparen" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="2" android:contentDescription="@string/desc_lparen" - android:text="@string/lparen" /> + android:text="@string/lparen" + app:layout_row="2" + app:layout_column="2" /> <Button android:id="@+id/rparen" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="3" android:contentDescription="@string/desc_rparen" - android:text="@string/rparen" /> + android:text="@string/rparen" + app:layout_row="2" + app:layout_column="3" /> <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:text="@string/op_sqrt" /> + android:text="@string/op_sqrt" + app:layout_row="2" + app:layout_column="4" /> <Button android:id="@+id/op_sqr" style="@style/PadButtonStyle.Advanced" - android:layout_row="2" - android:layout_column="4" android:contentDescription="@string/desc_op_sqr" android:fontFamily="sans-serif-medium" android:text="@string/op_sqr" - android:visibility="gone" /> + android:visibility="gone" + app:layout_row="2" + app:layout_column="4" /> -</GridLayout> +</android.support.v7.widget.GridLayout> |