commit ba85ecdf06ec64a3f7e9f06657fedaed3459f890
author Yi-Ling Chuang <emilychuang@google.com> Tue May 26 09:11:34 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 26 09:11:34 2020 +0000
tree 92303d26679b67acb6a5766f49b9d5e373bce4bd
parent 37318d03a4a438647cd696e59f1bb782c1a979c5
parent 350affcdfac507587118fc31338e93c636c9f403

Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev

src/com/android/settings/panel/PanelFragment.java

diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 9de4139..69d9e64c 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -200,15 +200,17 @@
         loadAllSlices();
 
         final IconCompat icon = mPanel.getIcon();
+        final CharSequence title = mPanel.getTitle();
         if (icon == null) {
             mTitleView.setVisibility(View.VISIBLE);
             mPanelHeader.setVisibility(View.GONE);
-            mTitleView.setText(mPanel.getTitle());
+            mTitleView.setText(title);
         } else {
             mTitleView.setVisibility(View.GONE);
             mPanelHeader.setVisibility(View.VISIBLE);
+            mPanelHeader.setAccessibilityPaneTitle(title);
             mTitleIcon.setImageIcon(icon.toIcon(getContext()));
-            mHeaderTitle.setText(mPanel.getTitle());
+            mHeaderTitle.setText(title);
             mHeaderSubtitle.setText(mPanel.getSubTitle());
             if (mPanel.getHeaderIconIntent() != null) {
                 mTitleIcon.setOnClickListener(getHeaderIconListener());