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

Commit 33e737bb authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "QS: Accessibility announce entering/exiting detail" into mnc-dev

parents 78528b22 17b70a50

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -1087,4 +1087,7 @@ 
    <!-- Alarm template for far alarms [CHAR LIMIT=25] -->

    <!-- Alarm template for far alarms [CHAR LIMIT=25] -->

    <string name="alarm_template_far">on <xliff:g id="when" example="Fri 7:00 AM">%1$s</xliff:g></string>

    <string name="alarm_template_far">on <xliff:g id="when" example="Fri 7:00 AM">%1$s</xliff:g></string>





    <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_detail">Quick Settings, <xliff:g id="title" example="Wi-Fi">%s</xliff:g>.</string>



</resources>
 
</resources>

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,8 @@ public class QSPanel extends ViewGroup { 
        mDetailDoneButton.setOnClickListener(new OnClickListener() {

        mDetailDoneButton.setOnClickListener(new OnClickListener() {

            @Override

            @Override

            public void onClick(View v) {

            public void onClick(View v) {

                announceForAccessibility(

                        mContext.getString(R.string.accessibility_desc_quick_settings));

                closeDetail();

                closeDetail();

            }

            }

        });

        });
@@ -392,6 +394,9 @@ public class QSPanel extends ViewGroup { 
            mDetail.bringToFront();

            mDetail.bringToFront();

            mDetailContent.addView(r.detailView);

            mDetailContent.addView(r.detailView);

            MetricsLogger.visible(mContext, detailAdapter.getMetricsCategory());

            MetricsLogger.visible(mContext, detailAdapter.getMetricsCategory());

            announceForAccessibility(mContext.getString(

                    R.string.accessibility_quick_settings_detail,

                    mContext.getString(detailAdapter.getTitle())));

            setDetailRecord(r);

            setDetailRecord(r);

            listener = mHideGridContentWhenDone;

            listener = mHideGridContentWhenDone;

            if (r instanceof TileRecord) {

            if (r instanceof TileRecord) {