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

Merge "[Audiosharing] Refine main sharing dialog." into main

Browse Source
This commit is contained in:
Yiyi Shen
2023-12-08 08:13:24 +00:00
committed by Android (Google) Code Review
parent eeec2a708c 13d09c97b2
commit f8ccd2bda3
4 changed files with 337 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
View File

@@ -22,6 +22,7 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
@@ -33,8 +34,10 @@ import com.android.internal.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.google.common.collect.Iterables;
import java.util.ArrayList;
import java.util.Locale;
import java.util.stream.Collectors;
public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
private static final String TAG = "AudioSharingDialog";
@@ -54,8 +57,6 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
private static DialogEventListener sListener;
private View mRootView;
@Override
public int getMetricsCategory() {
return SettingsEnums.DIALOG_START_AUDIO_SHARING;
@@ -90,40 +91,62 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
ArrayList<AudioSharingDeviceItem> deviceItems =
arguments.getParcelableArrayList(BUNDLE_KEY_DEVICE_ITEMS);
final AlertDialog.Builder builder =
new AlertDialog.Builder(getActivity()).setTitle("Share audio").setCancelable(false);
mRootView =
LayoutInflater.from(builder.getContext())
.inflate(R.layout.dialog_audio_sharing, /* parent= */ null);
TextView subTitle1 = mRootView.findViewById(R.id.share_audio_subtitle1);
TextView subTitle2 = mRootView.findViewById(R.id.share_audio_subtitle2);
new AlertDialog.Builder(getActivity()).setCancelable(false);
LayoutInflater inflater = LayoutInflater.from(builder.getContext());
View customTitle = inflater.inflate(R.layout.dialog_custom_title_audio_sharing, null);
ImageView icon = customTitle.findViewById(R.id.title_icon);
icon.setImageResource(R.drawable.ic_bt_audio_sharing);
TextView title = customTitle.findViewById(R.id.title_text);
View rootView = inflater.inflate(R.layout.dialog_audio_sharing, /* parent= */ null);
TextView subTitle1 = rootView.findViewById(R.id.share_audio_subtitle1);
TextView subTitle2 = rootView.findViewById(R.id.share_audio_subtitle2);
RecyclerView recyclerView = rootView.findViewById(R.id.btn_list);
Button shareBtn = rootView.findViewById(R.id.share_btn);
Button cancelBtn = rootView.findViewById(R.id.cancel_btn);
if (deviceItems.isEmpty()) {
subTitle1.setVisibility(View.INVISIBLE);
title.setText("Share your audio");
subTitle2.setText(
"To start sharing audio, connect additional headphones that support LE audio");
} else {
"To start sharing audio, "
+ "connect two pairs of headphones that support LE Audio");
ImageView image = rootView.findViewById(R.id.share_audio_guidance);
image.setVisibility(View.VISIBLE);
builder.setNegativeButton("Close", null);
} else if (deviceItems.size() == 1) {
title.setText("Share your audio");
subTitle1.setText(
String.format(
Locale.US,
"%d additional device%s connected",
deviceItems.size(),
deviceItems.size() > 1 ? "" : "s"));
deviceItems.stream()
.map(AudioSharingDeviceItem::getName)
.collect(Collectors.joining(" and ")));
subTitle2.setText(
"The headphones you share audio with will hear videos and music playing on this"
+ " phone");
"This device's music and videos will play on both pairs of headphones");
shareBtn.setText("Share audio");
shareBtn.setOnClickListener(
v -> {
sListener.onItemClick(Iterables.getOnlyElement(deviceItems));
dismiss();
});
cancelBtn.setOnClickListener(v -> dismiss());
subTitle1.setVisibility(View.VISIBLE);
shareBtn.setVisibility(View.VISIBLE);
cancelBtn.setVisibility(View.VISIBLE);
} else {
title.setText("Share audio with another device");
subTitle2.setText(
"This device's music and videos will play on the headphones you connect");
recyclerView.setAdapter(
new AudioSharingDeviceAdapter(
deviceItems,
(AudioSharingDeviceItem item) -> {
sListener.onItemClick(item);
dismiss();
}));
recyclerView.setLayoutManager(
new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
recyclerView.setVisibility(View.VISIBLE);
cancelBtn.setOnClickListener(v -> dismiss());
cancelBtn.setVisibility(View.VISIBLE);
}
RecyclerView recyclerView = mRootView.findViewById(R.id.btn_list);
recyclerView.setAdapter(
new AudioSharingDeviceAdapter(
deviceItems,
(AudioSharingDeviceItem item) -> {
sListener.onItemClick(item);
dismiss();
}));
recyclerView.setLayoutManager(
new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
Button cancelBtn = mRootView.findViewById(R.id.cancel_btn);
cancelBtn.setOnClickListener(v -> dismiss());
AlertDialog dialog = builder.setView(mRootView).create();
AlertDialog dialog = builder.setCustomTitle(customTitle).setView(rootView).create();
dialog.setCanceledOnTouchOutside(false);
return dialog;
}