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

Commit d4042abe authored by Beth Thibodeau's avatar Beth Thibodeau Committed by android-build-merger
Browse files

Update theme picker option colors 

am: 692dc78c

Change-Id: I7d9c8d2ef86f8df55774582caec2f5b060adde69
parents 48e84f69 692dc78c

res/color/option_title_color.xml

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

    <item

        android:state_activated="false"

        android:alpha="0.54"

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

    <item

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

res/drawable/option_border_custom.xml

0 → 100644
+25 −0
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_custom" />

</ripple>

res/drawable/option_border_edge_custom.xml

0 → 100644
+35 −0
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/black_24_alpha"

                android:alpha="0.24"

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

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

        </shape>

    </item>

</selector>

res/layout/custom_theme_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:layout_gravity="center_horizontal"

        android:paddingHorizontal="@dimen/option_tile_padding_horizontal"

        android:paddingVertical="@dimen/option_tile_padding_vertical"

        android:background="@drawable/option_border">

        android:background="@drawable/option_border_custom">

        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"