diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-10 21:33:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 21:33:56 +0000 |
| commit | 5b1548b6b4d37c905baa867c6065a10b68f77c51 (patch) | |
| tree | 6c49cce776453a530277889ceb93863d426e1a92 /packages/SystemUI | |
| parent | e2998a02696740ed179dd4726b2a331ddcfde2cc (diff) | |
| parent | bd1abe631cb0a405605babd811b5fd4dbe9e0cf8 (diff) | |
| download | frameworks_base-5b1548b6b4d37c905baa867c6065a10b68f77c51.zip frameworks_base-5b1548b6b4d37c905baa867c6065a10b68f77c51.tar.gz frameworks_base-5b1548b6b4d37c905baa867c6065a10b68f77c51.tar.bz2 | |
Merge "Zen a11y: Add a blurb re: screen readers to total silence." into mnc-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 0e0584f..d972111 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -772,6 +772,9 @@ <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] --> <string name="camera_hint">Swipe from icon for camera</string> + <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] --> + <string name="interruption_level_none_with_warning">Total silence. This will also silence screen readers.</string> + <!-- Interruption level: None. [CHAR LIMIT=40] --> <string name="interruption_level_none">Total silence</string> diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index ced1a3c..a0eb61f 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -153,7 +153,7 @@ public class ZenModePanel extends LinearLayout { mZenButtons = (SegmentedButtons) findViewById(R.id.zen_buttons); mZenButtons.addButton(R.string.interruption_level_none_twoline, - R.string.interruption_level_none, + R.string.interruption_level_none_with_warning, Global.ZEN_MODE_NO_INTERRUPTIONS); mZenButtons.addButton(R.string.interruption_level_alarms_twoline, R.string.interruption_level_alarms, |