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

Commit 3fdedfa2 authored by Diya Bera's avatar Diya Bera Committed by Android (Google) Code Review
Browse files

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

parents 9d16d9da 1a468846

core/res/res/layout/side_fps_toast.xml

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

              android:layout_height="wrap_content"

              android:minWidth="350dp"

              android:minWidth="350dp"

              android:layout_gravity="center"

              android:layout_gravity="center"

              android:theme="?attr/alertDialogTheme">

              android:background="@color/side_fps_toast_background">

    <TextView

    <TextView

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/fp_power_button_enrollment_title"

        android:text="@string/fp_power_button_enrollment_title"

        android:singleLine="true"

        android:singleLine="true"

        android:ellipsize="end"

        android:ellipsize="end"

        android:textColor="@color/side_fps_text_color"

        android:paddingLeft="20dp"/>

        android:paddingLeft="20dp"/>

    <Space

    <Space

        android:layout_width="wrap_content"

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

        android:text="@string/fp_power_button_enrollment_button_text"

        android:paddingRight="20dp"

        android:paddingRight="20dp"

        style="?android:attr/buttonBarNegativeButtonStyle"

        style="?android:attr/buttonBarNegativeButtonStyle"

        android:textColor="@color/side_fps_button_color"

        android:maxLines="1"/>

        android:maxLines="1"/>

</LinearLayout>
 
</LinearLayout>
 
 No newline at end of file

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

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

    <color name="user_icon_6">#ff4ecde6</color><!-- cyan -->

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

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

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

    <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>
 
</resources>

core/res/res/values/colors.xml

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

    <!-- Color of camera light when camera is in use -->

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

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

    <color name="camera_privacy_light_night">#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>
 
</resources>