Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826 Change-Id: I7a4f1366a1481e303afe73f21320cd3c421015e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -74,12 +74,12 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
|
||||
|
||||
TextView title = layout.findViewById(com.android.settingslib.R.id.dialog_title);
|
||||
TextView subTitle = layout.findViewById(com.android.settingslib.R.id.dialog_subtitle);
|
||||
title.setText(mContext.getString(R.string.bluetooth_broadcast_dialog_title));
|
||||
subTitle.setText(
|
||||
mContext.getString(R.string.bluetooth_broadcast_dialog_broadcast_message));
|
||||
|
||||
Button broadcastBtn = layout.findViewById(com.android.settingslib.R.id.positive_btn);
|
||||
if (isBroadcastSupported() && mIsMediaStreaming) {
|
||||
title.setText(mContext.getString(R.string.bluetooth_broadcast_dialog_title));
|
||||
subTitle.setText(
|
||||
mContext.getString(R.string.bluetooth_broadcast_dialog_broadcast_message));
|
||||
broadcastBtn.setVisibility(View.VISIBLE);
|
||||
if (TextUtils.isEmpty(mCurrentAppLabel)) {
|
||||
broadcastBtn.setText(mContext.getString(R.string.bluetooth_broadcast_dialog_title));
|
||||
@@ -92,6 +92,9 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
|
||||
launchMediaOutputBroadcastDialog();
|
||||
});
|
||||
} else {
|
||||
title.setText(mContext.getString(R.string.bluetooth_find_broadcast));
|
||||
subTitle.setText(
|
||||
mContext.getString(R.string.bluetooth_broadcast_dialog_find_message));
|
||||
broadcastBtn.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user