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

Commit 91c8e94d authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Swap delete for equals button in numeric pad and never hide it 

Change-Id: I287fd18a3ed6ba93620315c1c33f3af548d84a2e
parent e48848a4

res/layout/pad_numeric.xml

+4 −4
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ 
        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/eq"

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

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        android:id="@+id/del"

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

        android:contentDescription="@string/desc_del"

        app:icon="@drawable/ic_del"

        app:layout_row="3"

        app:layout_column="2" />

res/layout/pad_operator_one_col.xml

+0 −9
Original line number Diff line number Diff line
@@ -24,20 +24,11 @@ 
    app:rowCount="5"

    app:columnCount="1">



    <com.android.calculator2.HapticButton

        android:id="@+id/del"

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

        android:contentDescription="@string/desc_del"

        app:icon="@drawable/ic_del"

        app:layout_row="0"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

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

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        android:visibility="gone"

        app:layout_row="0"

        app:layout_column="0" />

res/layout/pad_operator_two_col.xml

+0 −9
Original line number Diff line number Diff line
@@ -32,20 +32,11 @@ 
        app:layout_row="0"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/del"

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

        android:contentDescription="@string/desc_del"

        app:icon="@drawable/ic_del"

        app:layout_row="0"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

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

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        android:visibility="gone"

        app:layout_row="0"

        app:layout_column="1" />

res/values-w375dp-h768dp-port/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 
        <item name="android:textSize">36dip</item>

    </style>



    <style name="PadButtonStyle.Numeric.Equals">

        <item name="android:visibility">gone</item>

    </style>



    <style name="PadButtonStyle.Operator">

        <item name="android:textSize">36dip</item>

    </style>

res/values-w520dp-h375dp-land/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 
        <item name="android:textSize">23dip</item>

    </style>



    <style name="PadButtonStyle.Numeric.Equals">

        <item name="android:visibility">gone</item>

    </style>



    <style name="PadButtonStyle.Operator">

        <item name="android:textSize">20dip</item>

    </style>