commit 0e5de165ca4121316fd1331bf171184bb38a150e
author Betty Chang <changbetty@google.com> Wed Aug 24 05:26:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 24 05:26:11 2022 +0000
tree cf5ab4ac5367d12f01515eb1affeab7ec6625c65
parent 4eef87c36faa0fc5cb46ecabf5e69757018367b7
parent 3852ceab9b26d6a5a1e972313eab34762058adfc

Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f am: 3852ceab9b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826

Change-Id: Ie1683d5586a6534220fb5c2024b7630267b454a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java

diff --git a/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java b/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
index dd06b67..62a66cf 100644
--- a/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
@@ -74,12 +74,12 @@
 
         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 @@
                 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);
         }