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

Commit bb90ea3b authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Side Fps Toast theme changes according to system theme." into tm-qpr-dev am: 3fdedfa2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19582555



Change-Id: I52da84dad86a36e93f76c606fe37a348dc062792
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd2ea040 3fdedfa2

core/res/res/layout/side_fps_toast.xml

+3 −1
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ 
              android:layout_height="wrap_content"

              android:minWidth="350dp"

              android:layout_gravity="center"

              android:theme="?attr/alertDialogTheme">

              android:background="@color/side_fps_toast_background">

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/fp_power_button_enrollment_title"

        android:singleLine="true"

        android:ellipsize="end"

        android:textColor="@color/side_fps_text_color"

        android:paddingLeft="20dp"/>

    <Space

        android:layout_width="wrap_content"
@@ -39,5 +40,6 @@ 
        android:text="@string/fp_power_button_enrollment_button_text"

        android:paddingRight="20dp"

        style="?android:attr/buttonBarNegativeButtonStyle"

        android:textColor="@color/side_fps_button_color"

        android:maxLines="1"/>

</LinearLayout>
 
 No newline at end of file

core/res/res/values-night/colors.xml

+6 −0
Original line number Diff line number Diff line
@@ -37,4 +37,10 @@ 
    <color name="user_icon_6">#ff4ecde6</color><!-- cyan -->

    <color name="user_icon_7">#fffbbc04</color><!-- yellow -->

    <color name="user_icon_8">#fffa903e</color><!-- orange -->



    <!-- Color for side fps toast dark theme-->

    <color name="side_fps_toast_background">#2E3132</color>

    <color name="side_fps_text_color">#EFF1F2</color>

    <color name="side_fps_button_color">#33B9DB</color>



</resources>

core/res/res/values/colors.xml

+6 −0
Original line number Diff line number Diff line
@@ -447,4 +447,10 @@ 
    <!-- Color of camera light when camera is in use -->

    <color name="camera_privacy_light_day">#FFFFFF</color>

    <color name="camera_privacy_light_night">#FFFFFF</color>



    <!-- Color for side fps toast light theme -->

    <color name="side_fps_toast_background">#F7F9FA</color>

    <color name="side_fps_text_color">#191C1D</color>

    <color name="side_fps_button_color">#00677E</color>



</resources>