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

Commit 2ad2fd9f authored by Chuck Liao's avatar Chuck Liao
Browse files

Add the border to the selected wallpaper. 

Bug: 149716966
Change-Id: I89ee55cd49c2d61cfb3bcab5d1feba956f3bb720
parent 5a9b5420

res/color/option_border_color.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item

        android:state_activated="true"

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

    <item

        android:state_activated="false"

        android:alpha="0.24"

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

    <item

        android:alpha="0.05"

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

</selector>

res/drawable/option_border.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

     Copyright (C) 2019 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

    <item android:drawable="@drawable/option_border_edge" />

</ripple>

res/drawable/option_border_edge.xml

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item android:state_activated="true">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_selected_border_width" />

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

        </shape>

    </item>

    <item android:state_activated="false">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_border_width" />

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

        </shape>

    </item>

</selector>

res/values-night/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,5 @@ 


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



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



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

</resources>

res/values/colors.xml

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

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

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

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



    <color name="status_bar_color">#ffffffff</color>
@@ -29,8 +28,6 @@ 
    <color name="shape_thumbnail_color">#b2b2b2</color>

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



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



    <color name="clockface_preview_background">@android:color/black</color>



    <color name="theme_preview_icon_color">@color/google_grey700</color>
@@ -58,7 +55,5 @@ 


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



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



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

</resources>