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

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

@@ -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 {
@@ -95,4 +96,4 @@ class TileRequestDialog(
         val label: CharSequence,
         val icon: Icon?
     )
-}
+}

packages/SystemUI/tests/src/com/android/systemui/qs/external/TileRequestDialogTest.kt

@@ -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)
+    }
+}