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

Commit 0e5de165 authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "[LE Audio] Display the correct title on broadcast assistant device"... 

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

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



Change-Id: Ie1683d5586a6534220fb5c2024b7630267b454a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4eef87c3 3852ceab

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

+6 −3
Original line number Diff line number Diff line
@@ -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);

        }