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

Commit 9730aef3 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: All keys are equal, but equals and clear are more equal 

Change-Id: Ic9edfcd98770c7c8e9849cf745bc3819c16b2475
parent fc353f20

res/layout/pad_operator_one_col.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    <com.android.calculator2.HapticButton

        android:id="@+id/eq"

        style="@style/PadButtonStyle.SmallText"

        android:theme="@style/Theme.Button.Operator"

        android:theme="@style/Theme.Button.Action"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        app:layout_row="3"

res/layout/pad_operator_one_col_aux.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

        style="@style/PadButtonStyle.Caps"

        android:theme="@style/Theme.Button.Operator"

        android:theme="@style/Theme.Button.Clear"

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        app:layout_row="0"

res/layout/pad_operator_two_col.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

        style="@style/PadButtonStyle.Caps"

        android:theme="@style/Theme.Button.Operator"

        android:theme="@style/Theme.Button.Clear"

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        app:layout_row="0"
@@ -109,7 +109,7 @@ 
    <com.android.calculator2.HapticButton

        android:id="@+id/eq"

        style="@style/PadButtonStyle.SmallText"

        android:theme="@style/Theme.Button.Operator"

        android:theme="@style/Theme.Button.Action"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        app:layout_row="3"

res/values/themes.xml

+10 −0
Original line number Diff line number Diff line
@@ -54,4 +54,14 @@ 
        <item name="colorOnContainer">?colorOnSecondaryContainer</item>

    </style>



    <style name="Theme.Button.Clear">

        <item name="colorContainer">?colorTertiaryContainer</item>

        <item name="colorOnContainer">?colorOnTertiaryContainer</item>

    </style>



    <style name="Theme.Button.Action">

        <item name="colorContainer">?colorPrimaryContainer</item>

        <item name="colorOnContainer">?colorOnPrimaryContainer</item>

    </style>



</resources>