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

Commit 8fb6ca3e authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Modify ripple for cancel button in search bar in widget picker." into sc-dev

parents 9bb83f65 2a9a1006
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
     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="oval">
            <size android:height="24dp" android:width="24dp"/>
            <solid android:color="@android:color/white"/>
        </shape>
    </item>
</ripple>
 No newline at end of file
+2 −4
Original line number Diff line number Diff line
@@ -31,11 +31,9 @@
        android:id="@+id/widgets_search_cancel_button"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:paddingVertical="12dp"
        android:paddingStart="8dp"
        android:paddingEnd="12dp"
        android:padding="12dp"
        android:src="@drawable/ic_gm_close_24"
        android:background="?android:selectableItemBackground"
        android:background="@drawable/full_rounded_transparent_ripple"
        android:layout_gravity="center"
        android:contentDescription="@string/widgets_full_sheet_cancel_button_description"
        android:visibility="gone"/>