diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-06 21:20:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 21:20:13 +0000 |
| commit | 0c467064e2ae4a49ae45cb87509e578dd021daf6 (patch) | |
| tree | 7469832ae1231e428b6e33e8e70d13666b90597d /packages | |
| parent | 54e685c4bc37c4d1258d3e272e5c012891d7e573 (diff) | |
| parent | 401943053fe65a0d28fc71f8d5687fed4fa024f8 (diff) | |
| download | frameworks_base-0c467064e2ae4a49ae45cb87509e578dd021daf6.zip frameworks_base-0c467064e2ae4a49ae45cb87509e578dd021daf6.tar.gz frameworks_base-0c467064e2ae4a49ae45cb87509e578dd021daf6.tar.bz2 | |
Merge "Volume a11y: Rename introduction 'confirm' button to 'close'." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/layout/zen_mode_panel.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 595c9ed..0264f3d 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -52,7 +52,7 @@ android:layout_alignParentEnd="true" android:background="@drawable/btn_borderless_rect" android:clickable="true" - android:contentDescription="@string/accessibility_desc_confirm" + android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" android:src="@drawable/ic_close" android:tint="@android:color/white" /> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8466a5a..8606a59 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -424,8 +424,8 @@ <string name="accessibility_desc_settings">Settings</string> <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_desc_recent_apps">Overview.</string> - <!-- Content description for the confirm button in the zen mode panel introduction message. [CHAR LIMIT=NONE] --> - <string name="accessibility_desc_confirm">Confirm</string> + <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] --> + <string name="accessibility_desc_close">Close</string> <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string> |