Merge "Add content description to tile" into tm-qpr-dev (27eb1be0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/external/TileRequestDialog.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ class TileRequestDialog(
		icon = tileData.icon?.loadDrawable(context)?.let {
		QSTileImpl.DrawableIcon(it)
		} ?: ResourceIcon.get(R.drawable.android)
		contentDescription = label
		}
		tile.onStateChanged(state)
		tile.post {

+17 −1

Original line number	Diff line number	Diff line
		@@ -163,4 +163,20 @@ class TileRequestDialogTest : SysuiTestCase() {
		assertThat(tile.isClickable).isFalse()
		assertThat(tile.isLongClickable).isFalse()
		}

		@Test
		fun setTileData_tileHasCorrectContentDescription() {
		val icon = Icon.createWithResource(mContext, R.drawable.cloud)
		val tileData = TileRequestDialog.TileData(APP_NAME, LABEL, icon)

		dialog.setTileData(tileData)
		dialog.show()

		TestableLooper.get(this).processAllMessages()

		val content = dialog.requireViewById<ViewGroup>(TileRequestDialog.CONTENT_ID)
		val tile = content.getChildAt(1) as QSTileView

		assertThat(tile.contentDescription).isEqualTo(LABEL)
		}
		}