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

Commit d652dcf8 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Fix ui after changes from upstream

parent f7f04d5d

res/layout-land/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/toggle_mode"

res/layout-land/input_pad.xml

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    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/clr"
@@ -215,7 +215,7 @@ 
        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

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

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

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/columnGuide4"

        app:layout_constraintStart_toEndOf="@id/columnGuide3"

res/layout/input_pad.xml

+1 −4
Original line number Diff line number Diff line
@@ -17,10 +17,7 @@ 
        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

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

        app:autoSizeTextType="uniform"

        app:autoSizeMinTextSize="14sp"

        app:autoSizeStepGranularity="1sp"

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

        app:layout_constraintBottom_toTopOf="@id/rowGuide1"

        app:layout_constraintEnd_toStartOf="@id/columnGuide1"

        app:layout_constraintStart_toStartOf="parent"

res/values-night-v34/color.xml

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2015 The Android Open Source Project

     SPDX-License-Identifier: Apache-2.0

-->

<resources>



    <!-- Display background -->

    <color name="history_background_color">@android:color/system_surface_container_dark</color>

    <color name="display_background_color">@android:color/system_surface_dark</color>



    <!-- Display text -->

    <color name="display_formula_text_color">@android:color/system_on_surface_dark</color>

    <color name="display_result_text_color">@android:color/system_tertiary_dark</color>

    <color name="display_result_exponent_text_color">@android:color/system_tertiary_dark</color>



</resources>

res/values-v34/color.xml

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2015 The Android Open Source Project

     SPDX-License-Identifier: Apache-2.0

-->

<resources>



    <!-- Display background -->

    <color name="history_background_color">@android:color/system_surface_container_light</color>

    <color name="display_background_color">@android:color/system_surface_light</color>



    <!-- Display text -->

    <color name="display_formula_text_color">@android:color/system_on_surface_light</color>

    <color name="display_result_text_color">@android:color/system_tertiary_light</color>

    <color name="display_result_exponent_text_color">@android:color/system_tertiary_light</color>



</resources>