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

Merge "Shows ripple inside SettingsSpinner and its dropdown items" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-01 14:51:27 +00:00
committed by Android (Google) Code Review
parent dfae713347 8814a0d560
commit 1f26477a0b
4 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml
View File

@@ -15,28 +15,30 @@
limitations under the License.
-->
<layer-list
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
android:paddingMode="stack">
android:color="@color/ripple_color">
<item
android:top="8dp"
android:bottom="8dp">
<shape>
<corners
android:radius="28dp"/>
<solid
android:color="?priv-android:attr/colorAccentPrimary"/>
<size
android:height="@dimen/spinner_height"/>
</shape>
<item android:id="@android:id/background">
<layer-list android:paddingMode="stack">
<item
android:top="8dp"
android:bottom="8dp">
<shape>
<corners android:radius="28dp"/>
<solid android:color="?priv-android:attr/colorAccentPrimary"/>
<size android:height="@dimen/spinner_height"/>
</shape>
</item>
<item
android:gravity="center|end"
android:width="18dp"
android:height="18dp"
android:end="8dp"
android:drawable="@drawable/arrow_drop_down"/>
</layer-list>
</item>
<item
android:gravity="center|end"
android:width="18dp"
android:height="18dp"
android:end="8dp"
android:drawable="@drawable/arrow_drop_down"/>
</layer-list>
</ripple>

15
packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 The Android Open Source Project
Copyright (C) 2018 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.
@@ -15,15 +15,14 @@
limitations under the License.
-->
<layer-list
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:priv-android="http://schemas.android.com/apk/prv/res/android">
xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
android:color="@color/ripple_color">
<item>
<item android:id="@android:id/background">
<shape>
<solid
android:color="?priv-android:attr/colorAccentSecondary"/>
<solid android:color="?priv-android:attr/colorAccentSecondary"/>
</shape>
</item>
</layer-list>
</ripple>

19
packages/SettingsLib/SettingsSpinner/res/values-night/colors.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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.
-->
<resources>
<color name="ripple_color">@*android:color/material_grey_900</color>
</resources>

19
packages/SettingsLib/SettingsSpinner/res/values/colors.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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.
-->
<resources>
<color name="ripple_color">?android:attr/colorControlHighlight</color>
</resources>