diff --git a/res/xml/bluetooth_audio_streams.xml b/res/xml/bluetooth_audio_streams.xml index 206fb34e5b6..b419eaaca49 100644 --- a/res/xml/bluetooth_audio_streams.xml +++ b/res/xml/bluetooth_audio_streams.xml @@ -24,7 +24,8 @@ android:key="audio_streams_scan_qr_code" android:title="@string/bluetooth_find_broadcast_button_scan" android:icon="@drawable/ic_add_24dp" - android:summary="@string/audio_streams_qr_code_summary" /> + android:summary="@string/audio_streams_qr_code_summary" + settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsScanQrCodeController" /> { + if (mFragment == null) { + Log.w(TAG, "displayPreference() mFragment is null!"); + return false; + } + if (preference.getKey().equals(KEY)) { + Intent intent = new Intent(mContext, QrCodeScanModeActivity.class); + intent.setAction( + BluetoothBroadcastUtils.ACTION_BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER); + mFragment.startActivityForResult(intent, REQUEST_SCAN_BT_BROADCAST_QR_CODE); + if (DEBUG) { + Log.w(TAG, "displayPreference() sent intent : " + intent); + } + return true; + } + return false; + }); + } + + private void updateVisibility() { + ThreadUtils.postOnBackgroundThread( + () -> { + boolean hasActiveLe = + AudioSharingUtils.getActiveSinkOnAssistant(mLocalBtManager).isPresent(); + ThreadUtils.postOnMainThread(() -> mPreference.setVisible(hasActiveLe)); + }); + } +} diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/qrcode/QrCodeScanModeActivity.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/qrcode/QrCodeScanModeActivity.java index d6d06348064..091ebcbf676 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/qrcode/QrCodeScanModeActivity.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/qrcode/QrCodeScanModeActivity.java @@ -16,10 +16,6 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams.qrcode; -import static com.android.settingslib.bluetooth.BluetoothBroadcastUtils.EXTRA_BLUETOOTH_DEVICE_SINK; -import static com.android.settingslib.bluetooth.BluetoothBroadcastUtils.EXTRA_BLUETOOTH_SINK_IS_GROUP; - -import android.bluetooth.BluetoothDevice; import android.content.Intent; import android.os.Bundle; import android.util.Log; @@ -44,9 +40,6 @@ public class QrCodeScanModeActivity extends QrCodeScanModeBaseActivity { private static final boolean DEBUG = BluetoothUtils.D; private static final String TAG = "QrCodeScanModeActivity"; - private boolean mIsGroupOp; - private BluetoothDevice mSink; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -88,8 +81,6 @@ public class QrCodeScanModeActivity extends QrCodeScanModeBaseActivity { Log.d(TAG, "showQrCodeScannerFragment"); } - mSink = intent.getParcelableExtra(EXTRA_BLUETOOTH_DEVICE_SINK); - mIsGroupOp = intent.getBooleanExtra(EXTRA_BLUETOOTH_SINK_IS_GROUP, false); if (DEBUG) { Log.d(TAG, "get extra from intent"); }