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

Commit 6c7e863e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Change ripple in edit button to circle" into tm-qpr-dev

parents b3e99da8 310aeecd
Loading
Loading
Loading
Loading
+36 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2023 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.
  -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
       android:inset="@dimen/qs_footer_action_inset">
    <ripple
        android:color="?android:attr/colorControlHighlight">
        <item android:id="@android:id/mask">
            <!-- We make this shape a rounded rectangle instead of a oval so that it can animate -->
            <!-- properly into an app/dialog. -->
            <shape android:shape="rectangle">
                <solid android:color="@android:color/white"/>
                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
            </shape>
        </item>
        <item>
            <shape android:shape="rectangle">
                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
            </shape>
        </item>

    </ripple>
</inset>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@
                    android:layout_width="@dimen/qs_footer_action_button_size"
                    android:layout_height="@dimen/qs_footer_action_button_size"
                    android:layout_gravity="center_vertical|end"
                    android:background="?android:attr/selectableItemBackground"
                    android:background="@drawable/qs_footer_edit_circle"
                    android:clickable="true"
                    android:contentDescription="@string/accessibility_quick_settings_edit"
                    android:focusable="true"