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

Commit 12827ffc authored by Tianguang Zhang's avatar Tianguang Zhang
Browse files

Remove hard-coded colors in Wallpaper Picker 

The CLs in this topic remove the hard-coded colors from the app, replacing them with ?android:attr/, ?attr/, and sometimes @color/ that is defined using device default colors.

Fixes: 173549815
Test: none added
Change-Id: I4f0d18c1c4afdc5e1651e5b34fef8c7d71cdf8b7
parent 8192e467

res/color/bottom_nav_item_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ 
        android:color="?android:colorAccent" />

    <item

        android:state_checked="false"

        android:color="@color/bottom_bar_icon_unchecked_color" />

        android:color="?android:textColorTertiary" />

</selector>
 
 No newline at end of file

res/color/edittext_background_color.xml

+7 −3
Original line number Diff line number Diff line
@@ -15,7 +15,11 @@ 
     limitations under the License.

-->

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

    <item android:alpha="0.16" android:color="@color/edit_background_base" android:state_hovered="true"/>

    <item android:alpha="0.04" android:color="@color/edit_background_base" android:state_enabled="false"/>

    <item android:alpha="0.05" android:color="@color/edit_background_base"/>

    <item android:alpha="0.16"

        android:color="?android:textColorTertiary"

        android:state_hovered="true"/>

    <item android:alpha="0.04"

        android:color="?android:textColorTertiary"

        android:state_enabled="false"/>

    <item android:alpha="0.05" android:color="?android:textColorTertiary"/>

</selector>
 
 No newline at end of file

res/drawable/theme_cover_scrim.xml→res/color/toolbar_icon_color.xml

+4 −12
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--



     Copyright (C) 2019 The Android Open Source Project

     Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -15,13 +14,6 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

       android:shape="rectangle">

   <gradient

        android:angle="90"

        android:centerY="25%"

        android:startColor="@color/black_38_alpha"

        android:centerColor="@android:color/transparent"

        android:endColor="@android:color/transparent"

        android:type="linear" />

</shape>
 
 No newline at end of file
 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?android:textColorPrimary"/>

</selector>

res/drawable/check_circle_grey_large.xml

+3 −2
Original line number Diff line number Diff line
@@ -13,12 +13,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item>

        <shape android:shape="oval">

            <size android:width="@dimen/center_check_size"

                android:height="@dimen/center_check_size" />

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

            <solid android:color="?androidprv:attr/colorAccentPrimaryVariant" />

        </shape>

    </item>

    <item>

res/drawable/ic_home.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@color/icon_background" />

    <background android:drawable="?android:colorAccent" />

    <foreground>

        <inset android:inset="16.6%" android:drawable="@drawable/icon_foreground" />

    </foreground>