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

Commit 94e47e6f authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2952-a15-theme' into 'a15' 

Port theme changes from A14

See merge request !37
parents cc5fc89f 8e536257

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -31,5 +31,6 @@ android_app { 
        "com.google.android.material_material",

        "ExactCalculator_com.hp_crcalc",

        "kotlin-stdlib",

        "elib",

    ],

}

res/layout/advanced_pad.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    style="@style/PadLayoutStyle.Advanced"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?colorSurface">

    android:background="@color/num_background">



    <com.android.calculator2.HapticButton

        android:id="@+id/op_sqrt"

res/layout/fragment_history.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
        android:minHeight="?attr/actionBarSize"

        android:navigationContentDescription="@string/desc_navigate_up"

        app:navigationIcon="?attr/homeAsUpIndicator"

        android:background="@color/e_action_bar"

        app:title="@string/title_history" />



    <androidx.recyclerview.widget.RecyclerView

res/layout/input_pad.xml

+4 −4
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 
    style="@style/PadLayoutStyle"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?colorSurface">

    android:background="@color/num_background">



    <com.android.calculator2.HapticButton

        android:id="@+id/lparen"

        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_lparen"

        android:text="@string/lparen"

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

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

        app:layout_constraintBottom_toTopOf="@id/rowGuide1"

        app:layout_constraintEnd_toStartOf="@id/columnGuide1"

        app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@ 
        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_rparen"

        android:text="@string/rparen"

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

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

        app:layout_constraintBottom_toTopOf="@id/rowGuide1"

        app:layout_constraintEnd_toStartOf="@id/columnGuide2"

        app:layout_constraintStart_toStartOf="@id/columnGuide1"
@@ -39,7 +39,7 @@ 
        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_op_pct"

        android:text="@string/op_pct"

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

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

        app:layout_constraintBottom_toTopOf="@id/rowGuide1"

        app:layout_constraintEnd_toStartOf="@id/columnGuide3"

        app:layout_constraintStart_toEndOf="@id/columnGuide2"

res/values-night/color.xml

+2 −10
Original line number Diff line number Diff line
@@ -4,14 +4,6 @@ 
     SPDX-License-Identifier: Apache-2.0

-->

<resources>



    <!-- Display background -->

    <color name="history_background_color">@color/material_dynamic_neutral30</color>

    <color name="display_background_color">@color/material_dynamic_neutral20</color>



    <!-- Display text -->

    <color name="display_formula_text_color">@color/material_dynamic_neutral90</color>

    <color name="display_result_text_color">@color/material_dynamic_neutral70</color>

    <color name="display_result_exponent_text_color">@color/material_dynamic_secondary60</color>



    <color name="num_key_background">#343434</color>

    <color name="opt_key_background">#405262</color>

</resources>