Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabian Kozynski
2023-02-24 18:07:47 +00:00
committed by Android (Google) Code Review
parent b3e99da85a 310aeecd08
commit 6c7e863eba
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SystemUI/res/drawable/qs_footer_edit_circle.xml Normal file
View File

@@ -0,0 +1,36 @@
<?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>

2
packages/SystemUI/res/layout/qs_footer_impl.xml
View File

@@ -64,7 +64,7 @@
android:layout_width="@dimen/qs_footer_action_button_size" android:layout_width="@dimen/qs_footer_action_button_size"
android:layout_height="@dimen/qs_footer_action_button_size" android:layout_height="@dimen/qs_footer_action_button_size"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:background="?android:attr/selectableItemBackground" android:background="@drawable/qs_footer_edit_circle"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/accessibility_quick_settings_edit" android:contentDescription="@string/accessibility_quick_settings_edit"
android:focusable="true" android:focusable="true"