Merge "Refactor `showDetailsContent` in `BluetoothDetailsContentViewModel`." into main (f550c7f1) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,9 +32,9 @@ fun BluetoothDetailsContent(detailsContentViewModel: BluetoothDetailsContentView
	val view =		val view =
	LayoutInflater.from(context)		LayoutInflater.from(context)
	.inflate(R.layout.bluetooth_tile_dialog, /* root= */ null)		.inflate(R.layout.bluetooth_tile_dialog, /* root= */ null)
	detailsContentViewModel.showDetailsContent(/* expandable= */ null, view)		detailsContentViewModel.bindDetailsView(view)
	view		view
	},		},
	onRelease = { detailsContentViewModel.contentManager.releaseView() },		onRelease = { detailsContentViewModel.unbindDetailsView() },
	)		)
	}		}

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

+190 −183

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,7 @@ import com.android.systemui.dagger.qualifiers.Application
	import com.android.systemui.dagger.qualifiers.Background		import com.android.systemui.dagger.qualifiers.Background
	import com.android.systemui.dagger.qualifiers.Main		import com.android.systemui.dagger.qualifiers.Main
	import com.android.systemui.plugins.ActivityStarter		import com.android.systemui.plugins.ActivityStarter
			import com.android.systemui.qs.flags.QsDetailedView
	import com.android.systemui.res.R		import com.android.systemui.res.R
	import com.android.systemui.statusbar.phone.SystemUIDialog		import com.android.systemui.statusbar.phone.SystemUIDialog
	import javax.inject.Inject		import javax.inject.Inject
	@@ -52,6 +53,7 @@ import kotlinx.coroutines.CoroutineScope
	import kotlinx.coroutines.Job		import kotlinx.coroutines.Job
	import kotlinx.coroutines.channels.awaitClose		import kotlinx.coroutines.channels.awaitClose
	import kotlinx.coroutines.channels.produce		import kotlinx.coroutines.channels.produce
			import kotlinx.coroutines.coroutineScope
	import kotlinx.coroutines.flow.combine		import kotlinx.coroutines.flow.combine
	import kotlinx.coroutines.flow.emptyFlow		import kotlinx.coroutines.flow.emptyFlow
	import kotlinx.coroutines.flow.filterNotNull		import kotlinx.coroutines.flow.filterNotNull
	@@ -91,29 +93,36 @@ constructor(
	private var job: Job? = null		private var job: Job? = null

	/**		/**
	* Shows the details content.		* Binds the bluetooth details view with BluetoothDetailsContentManager.
	*		*
	* @param view The view from which the dialog is shown. If view is null, it should show the		* @param view The view from which the bluetooth details content is shown.
	* bluetooth tile details view.
	*
	* TODO: b/378513956 Refactor this method into 2. One is called by the dialog to show the
	* dialog, another is called by the details view model to bind the view.
	*/		*/
	fun showDetailsContent(expandable: Expandable?, view: View?) {		fun bindDetailsView(view: View) {
			// If `QsDetailedView` is not enabled, it should show the dialog.
			QsDetailedView.assertInNewMode()

	cancelJob()		cancelJob()

	job =		job =
	coroutineScope.launch(context = mainDispatcher) {		coroutineScope.launch(context = mainDispatcher) {
	var updateDeviceItemJob: Job?		contentManager = createContentManager()
	var updateDialogUiJob: Job? = null		contentManager.bind(view)
	val dialog: SystemUIDialog?		contentManager.start()
	val context: Context		updateDetailsUI(context = view.context, dialog = null)
			}
			}

			/** Shows the bluetooth dialog. */
			fun showDialog(expandable: Expandable?) {
			// If `QsDetailedView` is enabled, it should show the details view.
			QsDetailedView.assertInLegacyMode()

			cancelJob()

	if (view == null) {		job =
	// Render with dialog		coroutineScope.launch(context = mainDispatcher) {
	val dialogDelegate = createBluetoothTileDialog()		val dialogDelegate = createBluetoothTileDialog()
	dialog = dialogDelegate.createDialog()		val dialog = dialogDelegate.createDialog()
	context = dialog.context

	val controller =		val controller =
	expandable?.dialogTransitionController(		expandable?.dialogTransitionController(
	@@ -123,41 +132,41 @@ constructor(
	)		)
	)		)
	controller?.let {		controller?.let {
	dialogTransitionAnimator.show(		dialogTransitionAnimator.show(dialog, it, animateBackgroundBoundsChange = true)
	dialog,
	it,
	animateBackgroundBoundsChange = true,
	)
	} ?: dialog.show()		} ?: dialog.show()
	// contentManager is created after dialog.show		// contentManager is created after dialog.show
	contentManager = dialogDelegate.contentManager		contentManager = dialogDelegate.contentManager
	} else {		updateDetailsUI(dialog.context, dialog)
	// Render with tile details view		}
	dialog = null
	context = view.context
	contentManager = createContentManager()
	contentManager.bind(view)
	contentManager.start()
	}		}

			/** Unbinds the details view when it goes away. */
			fun unbindDetailsView() {
			cancelJob()
			contentManager.releaseView()
			}

			private suspend fun updateDetailsUI(context: Context, dialog: SystemUIDialog?) {
			coroutineScope {
			var updateDeviceItemJob: Job?
			var updateDialogUiJob: Job? = null

	updateDeviceItemJob = launch {		updateDeviceItemJob = launch {
	deviceItemInteractor.updateDeviceItems(context, DeviceFetchTrigger.FIRST_LOAD)		deviceItemInteractor.updateDeviceItems(context, DeviceFetchTrigger.FIRST_LOAD)
	}		}

	// deviceItemUpdate is emitted when device item list is done fetching, update UI and		// deviceItemUpdate is emitted when device item list is done fetching, update UI and
	// stop the progress bar.		// stop the progress bar.
	combine(		combine(deviceItemInteractor.deviceItemUpdate, deviceItemInteractor.showSeeAllUpdate) {
	deviceItemInteractor.deviceItemUpdate,		deviceItem,
	deviceItemInteractor.showSeeAllUpdate,		showSeeAll ->
	) { deviceItem, showSeeAll ->
	updateDialogUiJob?.cancel()		updateDialogUiJob?.cancel()
	updateDialogUiJob = launch {		updateDialogUiJob = launch {
	contentManager.apply {		contentManager.apply {
	onDeviceItemUpdated(		onDeviceItemUpdated(
	deviceItem,		deviceItem,
	showSeeAll,		showSeeAll,
	showPairNewDevice =		showPairNewDevice = bluetoothStateInteractor.isBluetoothEnabled(),
	bluetoothStateInteractor.isBluetoothEnabled(),
	)		)
	animateProgressBar(false)		animateProgressBar(false)
	}		}
	@@ -217,7 +226,7 @@ constructor(
	}		}
	}		}
	}		}
	.launchIn(this@launch)		.launchIn(this@coroutineScope)
	launch { activate() }		launch { activate() }
	}		}
	}		}
	@@ -264,8 +273,7 @@ constructor(
	}		}

	DeviceItemClick.Target.ACTION_ICON -> {		DeviceItemClick.Target.ACTION_ICON -> {
	deviceItemActionInteractor.onActionIconClick(it.deviceItem) { intent		deviceItemActionInteractor.onActionIconClick(it.deviceItem) { intent ->
	->
	startSettingsActivity(intent, it.clickedView)		startSettingsActivity(intent, it.clickedView)
	}		}
	}		}
	@@ -303,7 +311,6 @@ constructor(
	.onEach { bluetoothAutoOnInteractor.setEnabled(it) }		.onEach { bluetoothAutoOnInteractor.setEnabled(it) }
	.launchIn(this)		.launchIn(this)
	}		}

	produce<Unit> { awaitClose { dialog?.cancel() } }		produce<Unit> { awaitClose { dialog?.cancel() } }
	}		}
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@ constructor(
	initialUiProperties: BluetoothDetailsContentViewModel.UiProperties,		initialUiProperties: BluetoothDetailsContentViewModel.UiProperties,
	cachedContentHeight: Int,		cachedContentHeight: Int,
	dialogCallback: BluetoothTileDialogCallback,		dialogCallback: BluetoothTileDialogCallback,
	dimissListener: Runnable,		dismissListener: Runnable,
	): BluetoothTileDialogDelegate		): BluetoothTileDialogDelegate
	}		}

packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -156,15 +156,13 @@ public class BluetoothTile extends QSTileImpl<BooleanState> {

	private void handleClickEvent(@Nullable Expandable expandable) {		private void handleClickEvent(@Nullable Expandable expandable) {
	if (mFeatureFlags.isEnabled(Flags.BLUETOOTH_QS_TILE_DIALOG)) {		if (mFeatureFlags.isEnabled(Flags.BLUETOOTH_QS_TILE_DIALOG)) {
	mDetailsContentViewModel.get().showDetailsContent(expandable, /* view= */ null);		mDetailsContentViewModel.get().showDialog(expandable);
	} else {		} else {
	// Secondary clicks are header clicks, just toggle.		// Secondary clicks are header clicks, just toggle.
	toggleBluetooth();		toggleBluetooth();
	}		}
	}		}



	@Override		@Override
	public Intent getLongClickIntent() {		public Intent getLongClickIntent() {
	return new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);		return new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);

packages/SystemUI/tests/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentViewModelTest.kt

+48 −13

Original line number	Original line	Diff line number	Diff line
	@@ -28,9 +28,11 @@ import com.android.internal.logging.UiEventLogger
	import com.android.settingslib.bluetooth.CachedBluetoothDevice		import com.android.settingslib.bluetooth.CachedBluetoothDevice
	import com.android.settingslib.bluetooth.LocalBluetoothManager		import com.android.settingslib.bluetooth.LocalBluetoothManager
	import com.android.settingslib.flags.Flags		import com.android.settingslib.flags.Flags
			import com.android.systemui.Flags.FLAG_QS_TILE_DETAILED_VIEW
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.animation.DialogTransitionAnimator		import com.android.systemui.animation.DialogTransitionAnimator
	import com.android.systemui.animation.Expandable		import com.android.systemui.animation.Expandable
			import com.android.systemui.flags.EnableSceneContainer
	import com.android.systemui.kosmos.testDispatcher		import com.android.systemui.kosmos.testDispatcher
	import com.android.systemui.kosmos.testScope		import com.android.systemui.kosmos.testScope
	import com.android.systemui.plugins.ActivityStarter		import com.android.systemui.plugins.ActivityStarter
	@@ -194,9 +196,9 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	}		}

	@Test		@Test
	fun testShowDetailsContent_noAnimation() {		fun testShowDialog_noAnimation() {
	testScope.runTest {		testScope.runTest {
	bluetoothDetailsContentViewModel.showDetailsContent(null, null)		bluetoothDetailsContentViewModel.showDialog(null)
	runCurrent()		runCurrent()

	verify(mDialogTransitionAnimator, never()).show(any(), any(), any())		verify(mDialogTransitionAnimator, never()).show(any(), any(), any())
	@@ -204,9 +206,9 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	}		}

	@Test		@Test
	fun testShowDetailsContent_animated() {		fun testShowDialog_animated() {
	testScope.runTest {		testScope.runTest {
	bluetoothDetailsContentViewModel.showDetailsContent(expandable, null)		bluetoothDetailsContentViewModel.showDialog(expandable)
	runCurrent()		runCurrent()

	verify(mDialogTransitionAnimator).show(any(), any(), anyBoolean())		verify(mDialogTransitionAnimator).show(any(), any(), anyBoolean())
	@@ -214,9 +216,11 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	}		}

	@Test		@Test
	fun testShowDetailsContent_animated_inDetailsView() {		@EnableSceneContainer
			@EnableFlags(FLAG_QS_TILE_DETAILED_VIEW)
			fun testBindDetailsView() {
	testScope.runTest {		testScope.runTest {
	bluetoothDetailsContentViewModel.showDetailsContent(expandable, mockView)		bluetoothDetailsContentViewModel.bindDetailsView(mockView)
	runCurrent()		runCurrent()

	verify(bluetoothDetailsContentManager).bind(mockView)		verify(bluetoothDetailsContentManager).bind(mockView)
	@@ -225,10 +229,10 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	}		}

	@Test		@Test
	fun testShowDetailsContent_animated_callInBackgroundThread() {		fun testShowDialog_animated_callInBackgroundThread() {
	testScope.runTest {		testScope.runTest {
	backgroundExecutor.execute {		backgroundExecutor.execute {
	bluetoothDetailsContentViewModel.showDetailsContent(expandable, null)		bluetoothDetailsContentViewModel.showDialog(expandable)
	runCurrent()		runCurrent()

	verify(mDialogTransitionAnimator).show(any(), any(), anyBoolean())		verify(mDialogTransitionAnimator).show(any(), any(), anyBoolean())
	@@ -237,10 +241,12 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	}		}

	@Test		@Test
	fun testShowDetailsContent_animated_callInBackgroundThread_inDetailsView() {		@EnableSceneContainer
			@EnableFlags(FLAG_QS_TILE_DETAILED_VIEW)
			fun testBindDetailsView_callInBackgroundThread() {
	testScope.runTest {		testScope.runTest {
	backgroundExecutor.execute {		backgroundExecutor.execute {
	bluetoothDetailsContentViewModel.showDetailsContent(expandable, mockView)		bluetoothDetailsContentViewModel.bindDetailsView(mockView)
	runCurrent()		runCurrent()

	verify(bluetoothDetailsContentManager).bind(mockView)		verify(bluetoothDetailsContentManager).bind(mockView)
	@@ -250,9 +256,21 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	}		}

	@Test		@Test
	fun testShowDetailsContent_fetchDeviceItem() {		fun testShowDialog_fetchDeviceItem() {
	testScope.runTest {		testScope.runTest {
	bluetoothDetailsContentViewModel.showDetailsContent(null, null)		bluetoothDetailsContentViewModel.showDialog(null)
			runCurrent()

			verify(deviceItemInteractor).deviceItemUpdate
			}
			}

			@Test
			@EnableSceneContainer
			@EnableFlags(FLAG_QS_TILE_DETAILED_VIEW)
			fun testBindDetailsView_fetchDeviceItem() {
			testScope.runTest {
			bluetoothDetailsContentViewModel.bindDetailsView(mockView)
	runCurrent()		runCurrent()

	verify(deviceItemInteractor).deviceItemUpdate		verify(deviceItemInteractor).deviceItemUpdate
	@@ -263,7 +281,24 @@ class BluetoothDetailsContentViewModelTest : SysuiTestCase() {
	fun testStartSettingsActivity_activityLaunched_dialogDismissed() {		fun testStartSettingsActivity_activityLaunched_dialogDismissed() {
	testScope.runTest {		testScope.runTest {
	whenever(deviceItem.cachedBluetoothDevice).thenReturn(cachedBluetoothDevice)		whenever(deviceItem.cachedBluetoothDevice).thenReturn(cachedBluetoothDevice)
	bluetoothDetailsContentViewModel.showDetailsContent(null, null)		bluetoothDetailsContentViewModel.showDialog(null)
			runCurrent()

			val clickedView = View(context)
			bluetoothDetailsContentViewModel.onPairNewDeviceClicked(clickedView)

			verify(uiEventLogger).log(BluetoothTileDialogUiEvent.PAIR_NEW_DEVICE_CLICKED)
			verify(activityStarter).postStartActivityDismissingKeyguard(any(), anyInt(), nullable())
			}
			}

			@Test
			@EnableSceneContainer
			@EnableFlags(FLAG_QS_TILE_DETAILED_VIEW)
			fun testStartSettingsActivity_activityLaunched_detailsViewDismissed() {
			testScope.runTest {
			whenever(deviceItem.cachedBluetoothDevice).thenReturn(cachedBluetoothDevice)
			bluetoothDetailsContentViewModel.bindDetailsView(mockView)
	runCurrent()		runCurrent()

	val clickedView = View(context)		val clickedView = View(context)