Merge "Include on/off state if dual target" into main (2c57cccc) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/TileUiStateTest.kt

+26 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,32 @@ class TileUiStateTest : SysuiTestCase() {
		.contains(resources.getString(R.string.tile_unavailable))
		}

		@Test
		fun dualTarget_inactive_hasStateDescriptionOff() {
		val state =
		QSTile.State().apply {
		state = Tile.STATE_INACTIVE
		handlesSecondaryClick = true
		}

		val uiState = state.toUiState()
		assertThat(uiState.accessibilityUiState.stateDescription)
		.contains(context.getString(R.string.switch_bar_off))
		}

		@Test
		fun dualTarget_active_hasStateDescriptionOn() {
		val state =
		QSTile.State().apply {
		state = Tile.STATE_ACTIVE
		handlesSecondaryClick = true
		}

		val uiState = state.toUiState()
		assertThat(uiState.accessibilityUiState.stateDescription)
		.contains(context.getString(R.string.switch_bar_on))
		}

		private fun QSTile.State.toUiState() = toUiState(resources)
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,11 @@ fun QSTile.State.toUiState(resources: Resources): TileUiState {
		// State handling and description
		val stateDescription = StringBuilder()
		val stateText =
		if (accessibilityRole == Role.Switch \|\| state == Tile.STATE_UNAVAILABLE) {
		if (
		accessibilityRole == Role.Switch \|\|
		state == Tile.STATE_UNAVAILABLE \|\|
		handlesSecondaryClick
		) {
		getStateText(resources)
		} else {
		""