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

Commit ec99c6b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update ThemePicker's dark theme colors" into ub-launcher3-qt-r1-dev

parents c580de0f 0f074b04

res/layout/fragment_clock_picker.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
                android:id="@+id/clock_preview_pager"

                android:id="@+id/clock_preview_pager"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:background="@color/secondary_color"

                android:background="@color/preview_pager_background"

                app:layout_constrainedHeight="true"

                app:layout_constrainedHeight="true"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

res/layout/fragment_grid_picker.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
                android:id="@+id/grid_preview_pager"

                android:id="@+id/grid_preview_pager"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:background="@color/secondary_color"

                android:background="@color/preview_pager_background"

                app:card_style="screen_aspect_ratio"

                app:card_style="screen_aspect_ratio"

                app:layout_constrainedHeight="true"

                app:layout_constrainedHeight="true"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintBottom_toTopOf="@id/options_container"

res/layout/fragment_theme_picker.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
                android:id="@+id/theme_preview_pager"

                android:id="@+id/theme_preview_pager"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:background="@color/secondary_color"

                android:background="@color/preview_pager_background"

                app:layout_constrainedHeight="true"

                app:layout_constrainedHeight="true"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

res/values-night/colors.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
<resources>

<resources>

    <color name="theme_preview_icon_color">@color/white_70_alpha</color>

    <color name="theme_preview_icon_color">@color/white_70_alpha</color>





    <color name="icon_thumbnail_color">@color/black_87_alpha</color>

    <color name="icon_thumbnail_color">@color/white_88_alpha</color>





    <color name="control_grey">#b3b3b3</color>

    <color name="control_grey">#b3b3b3</color>

    <color name="switch_track_tint">#171717</color>

    <color name="switch_track_tint">#171717</color>
@@ -39,4 +39,8 @@ 
    <color name="divider_color">@color/white_14_alpha</color>

    <color name="divider_color">@color/white_14_alpha</color>





    <color name="edit_background_base">@color/material_white_100</color>

    <color name="edit_background_base">@color/material_white_100</color>



    <color name="cover_title_color">@color/white_88_alpha</color>



    <color name="preview_pager_background">@color/google_grey900</color>

</resources>
 
</resources>

res/values/colors.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
    <color name="black_14_alpha">#24000000</color>

    <color name="black_14_alpha">#24000000</color>

    <color name="white_14_alpha">#24FFFFFF</color>

    <color name="white_14_alpha">#24FFFFFF</color>

    <color name="google_grey700">#5f6368</color>

    <color name="google_grey700">#5f6368</color>

    <color name="google_grey900">#202124</color>





    <color name="status_bar_color">#ffffffff</color>

    <color name="status_bar_color">#ffffffff</color>
@@ -58,4 +59,8 @@ 
    <color name="divider_color">@color/black_14_alpha</color>

    <color name="divider_color">@color/black_14_alpha</color>





    <color name="edit_background_base">@color/google_grey700</color>

    <color name="edit_background_base">@color/google_grey700</color>



    <color name="cover_title_color">@color/black_87_alpha</color>



    <color name="preview_pager_background">@color/secondary_color</color>

</resources>
 
</resources>