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

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

Merge "[Audiosharing] Update button background radius" into main

parents f77fbbe4 f6787fd8

res/drawable/audio_sharing_rounded_bg.xml

deleted100644 → 0
+0 −24
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.

  -->



<shape

    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

res/drawable/audio_sharing_rounded_bg_ripple.xml

deleted100644 → 0
+0 −21
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.

  -->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@drawable/audio_sharing_rounded_bg"/>

</ripple>
 
 No newline at end of file

res/layout/dialog_custom_body_audio_sharing.xml

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
            android:layout_gravity="center"

            android:layout_marginTop="4dp"

            android:textColor="?androidprv:attr/textColorOnAccent"

            android:background="@drawable/audio_sharing_rounded_bg_ripple"

            android:background="@drawable/audio_sharing_rounded_bg_ripple_top"

            android:visibility="gone" />



        <Button
@@ -75,7 +75,7 @@ 
            android:layout_gravity="center"

            android:layout_marginTop="4dp"

            android:textColor="?androidprv:attr/textColorOnAccent"

            android:background="@drawable/audio_sharing_rounded_bg_ripple"

            android:background="@drawable/audio_sharing_rounded_bg_ripple_bottom"

            android:visibility="gone" />

    </LinearLayout>

</ScrollView>
 
 No newline at end of file

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceAdapter.java

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ public class AudioSharingDeviceAdapter extends RecyclerView.Adapter<RecyclerView 
                mButtonView.setText(btnText);

                mButtonView.setOnClickListener(

                        v -> mOnClickListener.onClick(mDevices.get(position)));

                if (position == 0) {

                    mButtonView.setBackgroundResource(

                            com.android.settingslib.R.drawable.audio_sharing_rounded_bg_ripple_top);

                }

            } else {

                Log.w(TAG, "bind view skipped due to button view is null");

            }