Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add content description to tile" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-23 03:21:21 +00:00
committed by Android (Google) Code Review
parent 1db5348eef 6f235144c4
commit 27eb1be0d6
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/qs/external/TileRequestDialog.kt vendored
View File

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

16
packages/SystemUI/tests/src/com/android/systemui/qs/external/TileRequestDialogTest.kt vendored
View File

@@ -163,4 +163,20 @@ class TileRequestDialogTest : SysuiTestCase() {
assertThat(tile.isClickable).isFalse() assertThat(tile.isClickable).isFalse()
assertThat(tile.isLongClickable).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)
}
} }