diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml index a42153eca7f..a6db4d9f1dd 100644 --- a/res-product/values/strings.xml +++ b/res-product/values/strings.xml @@ -758,4 +758,8 @@ To listen to an audio stream, first connect headphones that support LE Audio to this phone. To listen to an audio stream, first connect headphones that support LE Audio to this tablet. To listen to an audio stream, first connect headphones that support LE Audio to this device. + + This phone doesn\'t support LE Audio, which is needed to listen to audio streams. + This tablet doesn\'t support LE Audio, which is needed to listen to audio streams. + This device doesn\'t support LE Audio, which is needed to listen to audio streams. diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java index 8e2795811ce..f29405dd698 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java @@ -54,9 +54,6 @@ public class AudioStreamConfirmDialog extends InstrumentedDialogFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (!AudioSharingUtils.isFeatureEnabled()) { - return; - } setShowsDialog(true); mActivity = getActivity(); if (mActivity == null) { @@ -84,6 +81,9 @@ public class AudioStreamConfirmDialog extends InstrumentedDialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { + if (!AudioSharingUtils.isFeatureEnabled()) { + return getUnsupporteDialog(); + } if (AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) { CachedBluetoothDevice connectedLeDevice = AudioStreamsHelper.getCachedBluetoothDeviceInSharingOrLeConnected( @@ -137,6 +137,21 @@ public class AudioStreamConfirmDialog extends InstrumentedDialogFragment { .build(); } + private Dialog getUnsupporteDialog() { + return new AudioStreamsDialogFragment.DialogBuilder(getActivity()) + .setTitle(getString(R.string.audio_streams_dialog_cannot_listen)) + .setSubTitle2(getString(R.string.audio_streams_dialog_unsupported_device_subtitle)) + .setRightButtonText(getString(R.string.audio_streams_dialog_close)) + .setRightButtonOnClickListener( + unused -> { + dismiss(); + if (mActivity != null) { + mActivity.finish(); + } + }) + .build(); + } + private Dialog getErrorDialog(String name) { return new AudioStreamsDialogFragment.DialogBuilder(getActivity()) .setTitle(getString(R.string.audio_streams_dialog_cannot_listen)) diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java index 695ad939d8c..ddb0b425d71 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java @@ -19,16 +19,12 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams; import android.os.Bundle; import com.android.settings.SettingsActivity; -import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils; public class AudioStreamConfirmDialogActivity extends SettingsActivity { @Override protected void onCreate(Bundle savedState) { super.onCreate(savedState); - if (!AudioSharingUtils.isFeatureEnabled()) { - finish(); - } } @Override