Merge "Fix a11y class name in QSTileState" into main (46c3f692) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileState.kt

+5 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,10 @@ package com.android.systemui.qs.tiles.viewmodel

		import android.content.Context
		import android.service.quicksettings.Tile
		import android.view.View
		import android.widget.Switch
		import com.android.systemui.common.shared.model.Icon
		import kotlin.reflect.KClass

		/**
		* Represents current a state of the tile to be displayed in on the view. Consider using
		@@ -111,7 +114,7 @@ data class QSTileState(
		var stateDescription: CharSequence? = null
		var sideViewIcon: SideViewIcon = SideViewIcon.None
		var enabledState: EnabledState = EnabledState.ENABLED
		var expandedAccessibilityClassName: String? = null
		var expandedAccessibilityClass: KClass<out View>? = Switch::class

		fun build(): QSTileState =
		QSTileState(
		@@ -124,7 +127,7 @@ data class QSTileState(
		stateDescription,
		sideViewIcon,
		enabledState,
		expandedAccessibilityClassName,
		expandedAccessibilityClass?.qualifiedName,
		)
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ class QSTileLoggerTest : SysuiTestCase() {
		"sd=null, " +
		"svi=None, " +
		"enabled=ENABLED, " +
		"a11y=null" +
		"a11y=android.widget.Switch" +
		"], " +
		"data=test_data"
		)
		@@ -154,7 +154,7 @@ class QSTileLoggerTest : SysuiTestCase() {
		"sd=null, " +
		"svi=None, " +
		"enabled=ENABLED, " +
		"a11y=null], " +
		"a11y=android.widget.Switch], " +
		"data=test_data"
		)
		}