Merge cherrypicks of ['googleplex-android-review.googlesource.com/28148523'] into 24Q4-release. (acc067cf) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/qs/QSLongPressEffectTest.kt

+0 −23

Original line number	Diff line number	Diff line
		@@ -274,29 +274,6 @@ class QSLongPressEffectTest : SysuiTestCase() {
		assertThat(couldClick).isFalse()
		}

		@Test
		fun onTileClick_whileIdle_withQSTile_clicks() =
		testWhileInState(QSLongPressEffect.State.IDLE) {
		// GIVEN that a click was detected
		val couldClick = longPressEffect.onTileClick()

		// THEN the click is successful
		assertThat(couldClick).isTrue()
		}

		@Test
		fun onTileClick_whileIdle_withoutQSTile_cannotClick() =
		testWhileInState(QSLongPressEffect.State.IDLE) {
		// GIVEN that no QSTile has been set
		longPressEffect.qsTile = null

		// GIVEN that a click was detected
		val couldClick = longPressEffect.onTileClick()

		// THEN the click is not successful
		assertThat(couldClick).isFalse()
		}

		private fun testWithScope(initialize: Boolean = true, test: suspend TestScope.() -> Unit) =
		with(kosmos) {
		testScope.runTest {

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ constructor(
		}

		fun onTileClick(): Boolean {
		if (state == State.TIMEOUT_WAIT \|\| state == State.IDLE) {
		if (state == State.TIMEOUT_WAIT) {
		setState(State.IDLE)
		qsTile?.let {
		it.click(expandable)