PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 4aa4c7119a

Browse Source 
Change-Id: I57064ac94a9c74f38a31fcf911d3d49df49ec1a7
This commit is contained in:
Yi-Ling Chuang
2020-05-26 09:47:04 +00:00
committed by Automerger Merge Worker
parent 597476cf78 4aa4c7119a
commit 8326951968
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/panel/PanelFragment.java
View File

@@ -200,15 +200,17 @@ public class PanelFragment extends Fragment {
loadAllSlices(); loadAllSlices();
final IconCompat icon = mPanel.getIcon(); final IconCompat icon = mPanel.getIcon();
final CharSequence title = mPanel.getTitle();
if (icon == null) { if (icon == null) {
mTitleView.setVisibility(View.VISIBLE); mTitleView.setVisibility(View.VISIBLE);
mPanelHeader.setVisibility(View.GONE); mPanelHeader.setVisibility(View.GONE);
mTitleView.setText(mPanel.getTitle()); mTitleView.setText(title);
} else { } else {
mTitleView.setVisibility(View.GONE); mTitleView.setVisibility(View.GONE);
mPanelHeader.setVisibility(View.VISIBLE); mPanelHeader.setVisibility(View.VISIBLE);
mPanelHeader.setAccessibilityPaneTitle(title);
mTitleIcon.setImageIcon(icon.toIcon(getContext())); mTitleIcon.setImageIcon(icon.toIcon(getContext()));
mHeaderTitle.setText(mPanel.getTitle()); mHeaderTitle.setText(title);
mHeaderSubtitle.setText(mPanel.getSubTitle()); mHeaderSubtitle.setText(mPanel.getSubTitle());
if (mPanel.getHeaderIconIntent() != null) { if (mPanel.getHeaderIconIntent() != null) {
mTitleIcon.setOnClickListener(getHeaderIconListener()); mTitleIcon.setOnClickListener(getHeaderIconListener());