Merge "Create BluetoothTileDialogModule to allow override on click behavior." into main (8a86b0a7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothTileDialogModule.kt

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.systemui.bluetooth.qsdialog

		import com.android.systemui.dagger.SysUISingleton
		import dagger.Binds
		import dagger.Module

		@Module
		interface BluetoothTileDialogModule {
		@Binds
		@SysUISingleton
		fun bindDeviceItemActionInteractor(
		impl: DeviceItemActionInteractorImpl
		): DeviceItemActionInteractor
		}

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothTileDialogViewModel.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ internal class BluetoothTileDialogViewModel
		@Inject
		constructor(
		private val deviceItemInteractor: DeviceItemInteractor,
		private val deviceItemActionInteractor: DeviceItemActionInteractor,
		private val bluetoothStateInteractor: BluetoothStateInteractor,
		private val bluetoothAutoOnInteractor: BluetoothAutoOnInteractor,
		private val audioSharingInteractor: AudioSharingInteractor,
		@@ -192,7 +193,7 @@ constructor(

		// deviceItemClick is emitted when user clicked on a device item.
		dialogDelegate.deviceItemClick
		.onEach { deviceItemInteractor.updateDeviceItemOnClick(it) }
		.onEach { deviceItemActionInteractor.onClick(it, dialog) }
		.launchIn(this)

		// contentHeight is emitted when the dialog is dismissed.

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemActionInteractor.kt

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.bluetooth.qsdialog

		import com.android.internal.logging.UiEventLogger
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.statusbar.phone.SystemUIDialog
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.withContext

		/** Defines interface for click handling of a DeviceItem. */
		interface DeviceItemActionInteractor {
		suspend fun onClick(deviceItem: DeviceItem, dialog: SystemUIDialog)
		}

		@SysUISingleton
		open class DeviceItemActionInteractorImpl
		@Inject
		constructor(
		@Background private val backgroundDispatcher: CoroutineDispatcher,
		private val logger: BluetoothTileDialogLogger,
		private val uiEventLogger: UiEventLogger,
		) : DeviceItemActionInteractor {

		override suspend fun onClick(deviceItem: DeviceItem, dialog: SystemUIDialog) {
		withContext(backgroundDispatcher) {
		logger.logDeviceClick(deviceItem.cachedBluetoothDevice.address, deviceItem.type)

		deviceItem.cachedBluetoothDevice.apply {
		when (deviceItem.type) {
		DeviceItemType.ACTIVE_MEDIA_BLUETOOTH_DEVICE -> {
		disconnect()
		uiEventLogger.log(BluetoothTileDialogUiEvent.ACTIVE_DEVICE_DISCONNECT)
		}
		DeviceItemType.AUDIO_SHARING_MEDIA_BLUETOOTH_DEVICE -> {
		uiEventLogger.log(BluetoothTileDialogUiEvent.AUDIO_SHARING_DEVICE_CLICKED)
		}
		DeviceItemType.AVAILABLE_MEDIA_BLUETOOTH_DEVICE -> {
		setActive()
		uiEventLogger.log(BluetoothTileDialogUiEvent.CONNECTED_DEVICE_SET_ACTIVE)
		}
		DeviceItemType.CONNECTED_BLUETOOTH_DEVICE -> {
		disconnect()
		uiEventLogger.log(
		BluetoothTileDialogUiEvent.CONNECTED_OTHER_DEVICE_DISCONNECT
		)
		}
		DeviceItemType.SAVED_BLUETOOTH_DEVICE -> {
		connect()
		uiEventLogger.log(BluetoothTileDialogUiEvent.SAVED_DEVICE_CONNECT)
		}
		}
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemInteractor.kt

+0 −34

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.bluetooth.BluetoothAdapter
		import android.bluetooth.BluetoothDevice
		import android.content.Context
		import android.media.AudioManager
		import com.android.internal.logging.UiEventLogger
		import com.android.settingslib.bluetooth.BluetoothCallback
		import com.android.settingslib.bluetooth.CachedBluetoothDevice
		import com.android.settingslib.bluetooth.LocalBluetoothManager
		@@ -52,7 +51,6 @@ constructor(
		private val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter(),
		private val localBluetoothManager: LocalBluetoothManager?,
		private val systemClock: SystemClock,
		private val uiEventLogger: UiEventLogger,
		private val logger: BluetoothTileDialogLogger,
		@Application private val coroutineScope: CoroutineScope,
		@Background private val backgroundDispatcher: CoroutineDispatcher,
		@@ -169,38 +167,6 @@ constructor(
		)
		}

		internal suspend fun updateDeviceItemOnClick(deviceItem: DeviceItem) {
		withContext(backgroundDispatcher) {
		logger.logDeviceClick(deviceItem.cachedBluetoothDevice.address, deviceItem.type)

		deviceItem.cachedBluetoothDevice.apply {
		when (deviceItem.type) {
		DeviceItemType.ACTIVE_MEDIA_BLUETOOTH_DEVICE -> {
		disconnect()
		uiEventLogger.log(BluetoothTileDialogUiEvent.ACTIVE_DEVICE_DISCONNECT)
		}
		DeviceItemType.AUDIO_SHARING_MEDIA_BLUETOOTH_DEVICE -> {
		uiEventLogger.log(BluetoothTileDialogUiEvent.AUDIO_SHARING_DEVICE_CLICKED)
		}
		DeviceItemType.AVAILABLE_MEDIA_BLUETOOTH_DEVICE -> {
		setActive()
		uiEventLogger.log(BluetoothTileDialogUiEvent.CONNECTED_DEVICE_SET_ACTIVE)
		}
		DeviceItemType.CONNECTED_BLUETOOTH_DEVICE -> {
		disconnect()
		uiEventLogger.log(
		BluetoothTileDialogUiEvent.CONNECTED_OTHER_DEVICE_DISCONNECT
		)
		}
		DeviceItemType.SAVED_BLUETOOTH_DEVICE -> {
		connect()
		uiEventLogger.log(BluetoothTileDialogUiEvent.SAVED_DEVICE_CONNECT)
		}
		}
		}
		}
		}

		internal fun setDeviceItemFactoryListForTesting(list: List<DeviceItemFactory>) {
		deviceItemFactoryList = list
		}

packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.android.systemui.qs.dagger.QSFlagsModule.RBC_AVAILABLE;
		import android.content.Context;
		import android.os.Handler;

		import com.android.systemui.bluetooth.qsdialog.BluetoothTileDialogModule;
		import com.android.systemui.dagger.NightDisplayListenerModule;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Background;
		@@ -60,6 +61,7 @@ import javax.inject.Named;
		*/
		@Module(subcomponents = {QSFragmentComponent.class, QSSceneComponent.class},
		includes = {
		BluetoothTileDialogModule.class,
		MediaModule.class,
		PanelsModule.class,
		QSExternalModule.class,