Merge "Set pane title for accessibility issues" into ub-launcher3-qt-r1-dev
diff --git a/src/com/android/customization/widget/OptionSelectorController.java b/src/com/android/customization/widget/OptionSelectorController.java
index 5e3a423..9c92079 100644
--- a/src/com/android/customization/widget/OptionSelectorController.java
+++ b/src/com/android/customization/widget/OptionSelectorController.java
@@ -311,6 +311,7 @@
             if (labelView != null && !TextUtils.isEmpty(labelView.getText())) {
                 labelView.setContentDescription(cd);
             } else if (tileView != null) {
+                tileView.setAccessibilityPaneTitle(cd);
                 tileView.setContentDescription(cd);
             }
         }
@@ -319,6 +320,7 @@
             if (labelView != null && !TextUtils.isEmpty(labelView.getText())) {
                 labelView.setContentDescription(title);
             } else if (tileView != null) {
+                tileView.setAccessibilityPaneTitle(title);
                 tileView.setContentDescription(title);
             }
         }