Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4d9013c authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Reorganize button styles 

Change-Id: I9cec9f38d5214cc5df20b5b8054f153d088680f4
parent e251c6d8

res/layout/pad_advanced_3x4.xml

+18 −18
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/toggle_mode"

        style="@style/PadButtonStyle.Advanced.Text"

        style="@style/PadButtonStyle.SmallCaps"

        android:contentDescription="@string/desc_switch_deg"

        android:text="@string/mode_deg"

        android:background="@color/pad_advanced_background_color"
@@ -35,7 +35,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_sqrt"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_sqrt"

        android:text="@string/op_sqrt"

        app:layout_row="0"
@@ -43,7 +43,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_sqr"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_sqr"

        android:fontFamily="sans-serif-medium"

        android:text="@string/op_sqr"
@@ -53,7 +53,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/const_pi"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_const_pi"

        android:text="@string/const_pi"

        app:layout_row="0"
@@ -61,7 +61,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/toggle_inv"

        style="@style/PadButtonStyle.Advanced.Text"

        style="@style/PadButtonStyle.SmallCaps"

        android:contentDescription="@string/desc_inv_off"

        android:text="@string/inv"

        app:layout_row="1"
@@ -69,7 +69,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_pow"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_pow"

        android:text="@string/op_pow"

        app:layout_row="1"
@@ -77,7 +77,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_fact"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_fact"

        android:text="@string/op_fact"

        app:layout_row="1"
@@ -85,7 +85,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_sin"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_sin"

        android:text="@string/fun_sin"

        app:layout_row="2"
@@ -93,7 +93,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_arcsin"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_arcsin"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_arcsin"
@@ -103,7 +103,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_cos"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_cos"

        android:text="@string/fun_cos"

        app:layout_row="2"
@@ -111,7 +111,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_arccos"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_arccos"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_arccos"
@@ -121,7 +121,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_tan"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_tan"

        android:text="@string/fun_tan"

        app:layout_row="2"
@@ -129,7 +129,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_arctan"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_arctan"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_arctan"
@@ -139,7 +139,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/const_e"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_const_e"

        android:text="@string/const_e"

        app:layout_row="3"
@@ -147,7 +147,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_ln"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_ln"

        android:text="@string/fun_ln"

        app:layout_row="3"
@@ -155,7 +155,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_exp"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_exp"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_exp"
@@ -165,7 +165,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_log"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_log"

        android:text="@string/fun_log"

        app:layout_row="3"
@@ -173,7 +173,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_10pow"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_10pow"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_10pow"

res/layout/pad_advanced_4x3.xml

+18 −18
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_sqrt"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_sqrt"

        android:text="@string/op_sqrt"

        app:layout_row="0"
@@ -34,7 +34,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_sqr"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_sqr"

        android:fontFamily="sans-serif-medium"

        android:text="@string/op_sqr"
@@ -44,7 +44,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/const_pi"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_const_pi"

        android:text="@string/const_pi"

        app:layout_row="0"
@@ -52,7 +52,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_pow"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_pow"

        android:text="@string/op_pow"

        app:layout_row="0"
@@ -60,7 +60,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_fact"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_op_fact"

        android:text="@string/op_fact"

        app:layout_row="0"
@@ -68,7 +68,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/toggle_mode"

        style="@style/PadButtonStyle.Advanced.Text"

        style="@style/PadButtonStyle.SmallCaps"

        android:contentDescription="@string/desc_switch_deg"

        android:text="@string/mode_deg"

        app:layout_row="1"
@@ -76,7 +76,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_sin"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_sin"

        android:text="@string/fun_sin"

        app:layout_row="1"
@@ -84,7 +84,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_arcsin"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_arcsin"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_arcsin"
@@ -94,7 +94,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_cos"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_cos"

        android:text="@string/fun_cos"

        app:layout_row="1"
@@ -102,7 +102,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_arccos"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_arccos"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_arccos"
@@ -112,7 +112,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_tan"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_tan"

        android:text="@string/fun_tan"

        app:layout_row="1"
@@ -120,7 +120,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_arctan"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_arctan"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_arctan"
@@ -130,7 +130,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/toggle_inv"

        style="@style/PadButtonStyle.Advanced.Text"

        style="@style/PadButtonStyle.SmallCaps"

        android:contentDescription="@string/desc_inv_off"

        android:text="@string/inv"

        app:layout_row="2"
@@ -138,7 +138,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/const_e"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_const_e"

        android:text="@string/const_e"

        app:layout_row="2"
@@ -146,7 +146,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_ln"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_ln"

        android:text="@string/fun_ln"

        app:layout_row="2"
@@ -154,7 +154,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_exp"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_exp"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_exp"
@@ -164,7 +164,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_log"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_log"

        android:text="@string/fun_log"

        app:layout_row="2"
@@ -172,7 +172,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/fun_10pow"

        style="@style/PadButtonStyle.Advanced"

        style="@style/PadButtonStyle.SmallText.Background"

        android:contentDescription="@string/desc_fun_10pow"

        android:fontFamily="sans-serif-medium"

        android:text="@string/fun_10pow"

res/layout/pad_numeric.xml

+12 −12
Original line number Diff line number Diff line
@@ -26,84 +26,84 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/digit_7"

        style="@style/PadButtonStyle.Numeric"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        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"

        style="@style/PadButtonStyle"

        android:text="@string/digit_0"

        app:layout_row="3"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/del"

        style="@style/PadButtonStyle.Numeric.Image"

        style="@style/PadButtonStyle.Image"

        android:contentDescription="@string/desc_del"

        app:icon="@drawable/ic_del"

        app:layout_row="3"

res/layout/pad_operator_one_col.xml

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_mul"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_op_mul"

        android:text="@string/op_mul"

        app:layout_row="0"
@@ -34,7 +34,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_sub"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_op_sub"

        android:text="@string/op_sub"

        app:layout_row="1"
@@ -42,7 +42,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_add"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_op_add"

        android:text="@string/op_add"

        app:layout_row="2"
@@ -50,7 +50,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/eq"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        app:layout_row="3"

res/layout/pad_operator_one_col_aux.xml

+6 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

        style="@style/PadButtonStyle.Operator.Text"

        style="@style/PadButtonStyle.Caps"

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        app:layout_row="0"
@@ -22,7 +22,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/paren"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_paren"

        android:text="@string/paren"

        app:layout_row="0"
@@ -30,7 +30,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/lparen"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_lparen"

        android:text="@string/lparen"

        android:visibility="gone"
@@ -39,7 +39,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/rparen"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_rparen"

        android:text="@string/rparen"

        android:visibility="gone"
@@ -48,7 +48,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_pct"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_op_pct"

        android:text="@string/op_pct"

        app:layout_row="0"
@@ -56,7 +56,7 @@ 


    <com.android.calculator2.HapticButton

        android:id="@+id/op_div"

        style="@style/PadButtonStyle.Operator"

        style="@style/PadButtonStyle.SmallText"

        android:contentDescription="@string/desc_op_div"

        android:text="@string/op_div"

        app:layout_row="0"