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

Commit 92ff8488 authored by Yabin Huang's avatar Yabin Huang
Browse files

Update focus highlight of dialog button 

Bug: 162026203
Test: manual
Change-Id: I021a317f78d672ee210fc52023f2f8bd0a383d72
parent 1a99a479

core/res/res/drawable-car-night/car_dialog_button_background.xml

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

<!--

  ~ Copyright (C) 2020 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_focused="true">

        <ripple android:color="#2371cd">

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

                <color android:color="@*android:color/car_white_1000"/>

            </item>

        </ripple>

    </item>

    <item>

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

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

                <color android:color="@*android:color/car_white_1000"/>

            </item>

        </ripple>

    </item>

</selector>

core/res/res/drawable-car/car_dialog_button_background.xml

+11 −4
Original line number Diff line number Diff line
@@ -16,11 +16,18 @@ 
  -->

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

    <item android:state_focused="true">

        <ripple android:color="#4b9eff">

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

                <color android:color="@*android:color/car_white_1000"/>

        <layer-list>

            <item>

                <shape android:shape="rectangle">

                    <solid android:color="#3D94CBFF"/>

                </shape>

            </item>

        </ripple>

            <item>

                <shape android:shape="rectangle">

                    <stroke android:width="8dp" android:color="#94CBFF"/>

                </shape>

            </item>

        </layer-list>

    </item>

    <item>

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