Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e83b6a3 authored by Yi-Ling Chuang's avatar Yi-Ling Chuang Committed by Automerger Merge Worker
Browse files

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

Change-Id: I28b8cdd051bb903456c8179b31b9f7c3413b450d
parents 7a56e81a ba85ecdf

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

+4 −2
Original line number Diff line number Diff line
@@ -206,15 +206,17 @@ public class PanelFragment extends Fragment { 
        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());