diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-09 18:41:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 18:41:14 +0000 |
| commit | 33e737bbd15bd76b59dd98a84743ab4167ae80d3 (patch) | |
| tree | 57c2dd1612197fa92f9834a19acc6c0fff5352d3 /packages | |
| parent | 78528b22c29f570469fe3c75328042f83a5a24c3 (diff) | |
| parent | 17b70a503d9f8f1512631ae0cec00a17a85aeeed (diff) | |
| download | frameworks_base-33e737bbd15bd76b59dd98a84743ab4167ae80d3.zip frameworks_base-33e737bbd15bd76b59dd98a84743ab4167ae80d3.tar.gz frameworks_base-33e737bbd15bd76b59dd98a84743ab4167ae80d3.tar.bz2 | |
Merge "QS: Accessibility announce entering/exiting detail" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index de2f1f9..8a3aa5f 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1087,4 +1087,7 @@ <!-- 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> + <!-- 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> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index cd4f299..25e3d10 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -111,6 +111,8 @@ public class QSPanel extends ViewGroup { mDetailDoneButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { + announceForAccessibility( + mContext.getString(R.string.accessibility_desc_quick_settings)); closeDetail(); } }); @@ -392,6 +394,9 @@ public class QSPanel extends ViewGroup { mDetail.bringToFront(); mDetailContent.addView(r.detailView); MetricsLogger.visible(mContext, detailAdapter.getMetricsCategory()); + announceForAccessibility(mContext.getString( + R.string.accessibility_quick_settings_detail, + mContext.getString(detailAdapter.getTitle()))); setDetailRecord(r); listener = mHideGridContentWhenDone; if (r instanceof TileRecord) { |