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

Commit 3adbe363 authored by Yabin Huang's avatar Yabin Huang Committed by Automerger Merge Worker
Browse files

Merge "Update focus highlight of car dialog button" into rvc-dev am:... 

Merge "Update focus highlight of car dialog button" into rvc-dev am: 333f7c95 am: 88951317 am: 4ae1f8f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921467

Change-Id: I2d4d319f323c3dd8ae22a90116fa969aaccbb94a
parents 88980fc3 4ae1f8f5

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

0 → 100644
+32 −0
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

+15 −5
Original line number Diff line number Diff line
@@ -14,9 +14,19 @@ 
  ~ 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">

<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"/>

            </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>