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

Commit 1f632685 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Add rounded background with different radius" into main

parents b92c3c34 bac53a61

packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple.xml

+7 −1
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/res/drawable/audio_sharing_rounded_bg.xml→packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_bottom.xml

+14 −7
Original line number Diff line number Diff line 
<?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">

    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" />

    <corners android:radius="12dp" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SettingsLib/res/drawable/audio_sharing_rounded_bg_ripple_top.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?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