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

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

Browse Source
This commit is contained in:
Yiyi Shen
2023-12-08 06:19:35 +00:00
committed by Android (Google) Code Review
parent eacde88922 fb617e423e
commit eeec2a708c
3 changed files with 196 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.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;
@@ -48,7 +49,6 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
}
private static DialogEventListener sListener;
private View mRootView;
@Override
public int getMetricsCategory() {
@@ -86,14 +86,17 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
arguments.getParcelableArrayList(BUNDLE_KEY_DEVICE_ITEMS);
String newDeviceName = arguments.getString(BUNDLE_KEY_NEW_DEVICE_NAME);
final AlertDialog.Builder builder =
new AlertDialog.Builder(getActivity())
.setTitle("Share audio?")
.setCancelable(false);
mRootView =
LayoutInflater.from(builder.getContext())
.inflate(R.layout.dialog_audio_sharing_join, null /* parent */);
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, /* parent= */ 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);
title.setText("Share your audio");
View rootView = inflater.inflate(R.layout.dialog_audio_sharing_join, /* parent= */ null);
TextView subtitle1 = rootView.findViewById(R.id.share_audio_subtitle1);
TextView subtitle2 = rootView.findViewById(R.id.share_audio_subtitle2);
if (deviceItems.isEmpty()) {
subtitle1.setText(newDeviceName);
} else {
@@ -106,10 +109,9 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
.collect(Collectors.joining(", ")),
newDeviceName));
}
subtitle2.setText(
"Connected eligible headphones will hear videos ad music playing on this phone");
Button shareBtn = mRootView.findViewById(R.id.share_btn);
Button cancelBtn = mRootView.findViewById(R.id.cancel_btn);
subtitle2.setText("This device's music and videos will play on both pairs of headphones");
Button shareBtn = rootView.findViewById(R.id.share_btn);
Button cancelBtn = rootView.findViewById(R.id.cancel_btn);
shareBtn.setOnClickListener(
v -> {
sListener.onShareClick();
@@ -117,7 +119,7 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
});
shareBtn.setText("Share audio");
cancelBtn.setOnClickListener(v -> dismiss());
Dialog dialog = builder.setView(mRootView).create();
Dialog dialog = builder.setCustomTitle(customTitle).setView(rootView).create();
dialog.setCanceledOnTouchOutside(false);
return dialog;
}