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

Commit 851f97da authored by Catherine Liang's avatar Catherine Liang
Browse files

Fix wallpaper picker color for contrast issues (2/2) 

Fix color of tabs on the landing page and picker fragments. Fix
selection border color of wallpaper and color quick switcher. Fix quick
switcher checkmark color. Fix text and icon colors for "Clock color &
size", "More wallpapers" and "More colors"

Bug: 281081163
Bug: 278641745
Test: verified manually, see bug
Change-Id: Id4a08573d4dbb6ba6c1339694ee986a916d2d9be
parent a0636139

res/color/keyguard_quick_affordance_slot_tab_background_color.xml→res/color/picker_fragment_tab_background_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true" android:color="@color/color_accent_primary" />

    <item android:state_selected="true" android:color="@color/system_primary" />

    <item android:color="@android:color/transparent" />

</selector>

res/color/picker_fragment_tab_text_color.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true" android:color="@color/text_color_on_accent" />

    <item android:color="@color/text_color_primary" />

    <item android:state_selected="true" android:color="@color/system_on_primary" />

    <item android:color="@color/system_on_surface" />

</selector>

res/drawable/color_option_selected_no_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="2dp"

            android:useLevel="false">

            <solid android:color="@color/text_color_primary"/>

            <solid android:color="@color/system_secondary"/>

        </shape>

    </item>

    <item

res/drawable/ic_settings.xml

+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tintMode="multiply"

    android:tint="@color/text_color_primary">

    android:viewportHeight="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Z"/>

res/drawable/picker_fragment_tab_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <corners android:radius="12dp" />

    <solid android:color="@color/keyguard_quick_affordance_slot_tab_background_color" />

    <solid android:color="@color/picker_fragment_tab_background_color" />

</shape>