Merge "Avoid disabling long clicks for small dual target" into main (fd702edc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt

+7 −6

Original line number	Diff line number	Diff line
		@@ -192,21 +192,22 @@ fun Tile(
		)
		.graphicsLayer { alpha = animatedAlpha },
		) { expandable ->
		// Use main click on long press for small, available dual target tiles.
		// Open settings otherwise.
		val useLongClickToSettings = !(iconOnly && isDualTarget && isClickable)
		val longClick: (() -> Unit)? =
		{
		hapticsViewModel?.setTileInteractionState(
		TileHapticsViewModel.TileInteractionState.LONG_CLICKED
		)

		// User main click on long press for small dual target tiles
		if (iconOnly && isDualTarget) {
		tile.mainClick(expandable)
		} else {
		// Settings click otherwise
		if (useLongClickToSettings) {
		tile.settingsClick(expandable)
		} else {
		tile.mainClick(expandable)
		}
		}
		.takeIf { uiState.handlesLongClick }
		.takeIf { !useLongClickToSettings \|\| uiState.handlesLongClick }

		TileContainer(
		onClick = onClick@{

packages/SystemUI/tests/src/com/android/systemui/qs/panels/ui/compose/TileTest.kt

+106 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.qs.panels.ui.compose

		import android.service.quicksettings.Tile.STATE_UNAVAILABLE
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.rememberCoroutineScope
		import androidx.compose.ui.test.junit4.createComposeRule
		@@ -204,6 +205,111 @@ class TileTest : SysuiTestCase() {
		assertThat(tile.interactions).containsExactly(InteractableFakeQSTile.Interaction.CLICK)
		}

		@Test
		fun longClick_smallDualTargetTile_doesNotHandleLongClick_shouldReceiveClick() {
		val tile = InteractableFakeQSTile()
		tile.fakeTile.changeState(
		QSTile.State().apply {
		contentDescription = "smallDualTargetTile"
		handlesSecondaryClick = true
		handlesLongClick = false
		}
		)
		val viewModel = TileViewModel(tile.fakeTile, TileSpec.Companion.create("test"))

		composeRule.setContent { TestTile(viewModel, iconOnly = true) }
		composeRule.waitForIdle()

		composeRule.onNodeWithContentDescription("smallDualTargetTile").performTouchInput {
		longClick()
		}

		assertThat(tile.interactions).containsExactly(InteractableFakeQSTile.Interaction.CLICK)
		}

		@Test
		fun longClick_largeDualTargetTile_doesNotHandleLongClick_shouldNotReceiveLongClick() {
		val tile = InteractableFakeQSTile()
		tile.fakeTile.changeState(
		QSTile.State().apply {
		label = "largeDualTargetTile"
		handlesSecondaryClick = true
		handlesLongClick = false
		}
		)
		val viewModel = TileViewModel(tile.fakeTile, TileSpec.Companion.create("test"))

		composeRule.setContent { TestTile(viewModel, iconOnly = false) }
		composeRule.waitForIdle()

		composeRule.onNodeWithText("largeDualTargetTile").performTouchInput { longClick() }

		// Long clicks default to a normal click when a tile does not handle long clicks
		assertThat(tile.interactions).containsExactly(InteractableFakeQSTile.Interaction.CLICK)
		}

		@Test
		fun longClick_smallTile_doesNotHandleLongClick_shouldNotReceiveLongClick() {
		val tile = InteractableFakeQSTile()
		tile.fakeTile.changeState(
		QSTile.State().apply {
		contentDescription = "smallTile"
		handlesLongClick = false
		}
		)
		val viewModel = TileViewModel(tile.fakeTile, TileSpec.Companion.create("test"))

		composeRule.setContent { TestTile(viewModel, iconOnly = true) }
		composeRule.waitForIdle()

		composeRule.onNodeWithContentDescription("smallTile").performTouchInput { longClick() }

		// Long clicks default to a normal click when a tile does not handle long clicks
		assertThat(tile.interactions).containsExactly(InteractableFakeQSTile.Interaction.CLICK)
		}

		@Test
		fun longClick_largeTile_doesNotHandleLongClick_shouldReceiveLongClick() {
		val tile = InteractableFakeQSTile()
		tile.fakeTile.changeState(
		QSTile.State().apply {
		label = "largeTile"
		handlesLongClick = false
		}
		)
		val viewModel = TileViewModel(tile.fakeTile, TileSpec.Companion.create("test"))

		composeRule.setContent { TestTile(viewModel, iconOnly = false) }
		composeRule.waitForIdle()

		composeRule.onNodeWithText("largeTile").performTouchInput { longClick() }

		// Long clicks default to a normal click when a tile does not handle long clicks
		assertThat(tile.interactions).containsExactly(InteractableFakeQSTile.Interaction.CLICK)
		}

		@Test
		fun longClick_smallDualTargetTile_isUnavailable_shouldReceiveLongClick() {
		val tile = InteractableFakeQSTile()
		tile.fakeTile.changeState(
		QSTile.State().apply {
		contentDescription = "smallDualTargetTile"
		handlesSecondaryClick = true
		state = STATE_UNAVAILABLE
		}
		)
		val viewModel = TileViewModel(tile.fakeTile, TileSpec.Companion.create("test"))

		composeRule.setContent { TestTile(viewModel, iconOnly = true) }
		composeRule.waitForIdle()

		composeRule.onNodeWithContentDescription("smallDualTargetTile").performTouchInput {
		longClick()
		}

		assertThat(tile.interactions).containsExactly(InteractableFakeQSTile.Interaction.LONG_CLICK)
		}

		private class InteractableFakeQSTile {
		val interactions = mutableListOf<Interaction>()