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

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

Merge "[Audiosharing] Add prefix to device list item text in adapter." into main

parents f3e693d7 ab3136a5

res/layout/audio_sharing_device_item.xml

+6 −5
Original line number Diff line number Diff line
@@ -17,16 +17,17 @@ 


<FrameLayout

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <Button

        android:id="@+id/device_button"

        android:overScrollMode="never"

        style="@style/SettingsLibActionButton"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAlignment="center"

        android:text=""/>

        android:layout_marginTop="4dp"

        android:background="@drawable/audio_sharing_rounded_bg_ripple"

        android:textAlignment="center" />



</FrameLayout>
 
 No newline at end of file

res/layout/dialog_audio_sharing.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        android:src="@drawable/audio_sharing_guidance"

        android:visibility="gone" />



    <com.android.internal.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/btn_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

res/layout/dialog_audio_sharing_disconnect.xml

+4 −2
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ 
        android:layout_gravity="center"

        android:paddingBottom="24dp" />



    <com.android.internal.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/device_btn_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center" />

        android:layout_gravity="center"

        android:nestedScrollingEnabled="false"

        android:overScrollMode="never" />



    <Button

        android:id="@+id/cancel_btn"

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

+6 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.Button;



import com.android.internal.widget.RecyclerView;

import androidx.recyclerview.widget.RecyclerView;



import com.android.settings.R;



import java.util.ArrayList;
@@ -32,11 +33,13 @@ public class AudioSharingDeviceAdapter extends RecyclerView.Adapter<RecyclerView 
    private static final String TAG = "AudioSharingDeviceAdapter";

    private final ArrayList<AudioSharingDeviceItem> mDevices;

    private final OnClickListener mOnClickListener;

    private final String mPrefix;



    public AudioSharingDeviceAdapter(

            ArrayList<AudioSharingDeviceItem> devices, OnClickListener listener) {

            ArrayList<AudioSharingDeviceItem> devices, OnClickListener listener, String prefix) {

        mDevices = devices;

        mOnClickListener = listener;

        mPrefix = prefix;

    }



    private class AudioSharingDeviceViewHolder extends RecyclerView.ViewHolder {
@@ -49,7 +52,7 @@ public class AudioSharingDeviceAdapter extends RecyclerView.Adapter<RecyclerView 


        public void bindView(int position) {

            if (mButtonView != null) {

                mButtonView.setText(mDevices.get(position).getName());

                mButtonView.setText(mPrefix + mDevices.get(position).getName());

                mButtonView.setOnClickListener(

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

            } else {

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

+4 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import android.widget.TextView; 
import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;



import com.android.internal.widget.LinearLayoutManager;

import com.android.internal.widget.RecyclerView;

import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -139,7 +139,8 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment { 
                            (AudioSharingDeviceItem item) -> {

                                sListener.onItemClick(item);

                                dismiss();

                            }));

                            },

                            "Connect "));

            recyclerView.setLayoutManager(

                    new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));

            recyclerView.setVisibility(View.VISIBLE);