diff options
| -rw-r--r-- | packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple.xml | 8 | ||||
| -rw-r--r-- | packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_bottom.xml (renamed from packages/SettingsLib/res/drawable/audio_sharing_rounded_bg.xml) | 21 | ||||
| -rw-r--r-- | packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_top.xml | 31 |
3 files changed, 52 insertions, 8 deletions
diff --git a/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple.xml b/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple.xml index 18696c627ec6..91a95a51fae2 100644 --- a/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple.xml +++ b/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple.xml @@ -16,6 +16,12 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:color="?android:attr/colorControlHighlight"> - <item android:drawable="@drawable/audio_sharing_rounded_bg"/> + <item> + <shape android:shape="rectangle"> + <corners android:radius="4dp" /> + <solid android:color="?androidprv:attr/colorAccentPrimary" /> + </shape> + </item> </ripple>
\ No newline at end of file diff --git a/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg.xml b/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_bottom.xml index 35517ea0ec11..cce8a75a3385 100644 --- a/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg.xml +++ b/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_bottom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2023 The Android Open Source Project + ~ Copyright (C) 2024 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,10 +15,17 @@ ~ limitations under the License. --> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" +<ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:shape="rectangle"> - <solid android:color="?androidprv:attr/colorAccentPrimary" /> - <corners android:radius="12dp" /> -</shape>
\ No newline at end of file + android:color="?android:attr/colorControlHighlight"> + <item> + <shape android:shape="rectangle"> + <corners + android:bottomLeftRadius="12dp" + android:bottomRightRadius="12dp" + android:topLeftRadius="4dp" + android:topRightRadius="4dp" /> + <solid android:color="?androidprv:attr/colorAccentPrimary" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_top.xml b/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_top.xml new file mode 100644 index 000000000000..140419705dd5 --- /dev/null +++ b/packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_top.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2024 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" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:color="?android:attr/colorControlHighlight"> + <item> + <shape android:shape="rectangle"> + <corners + android:bottomLeftRadius="4dp" + android:bottomRightRadius="4dp" + android:topLeftRadius="12dp" + android:topRightRadius="12dp" /> + <solid android:color="?androidprv:attr/colorAccentPrimary" /> + </shape> + </item> +</ripple>
\ No newline at end of file |