diff options
| author | 2016-08-22 20:28:22 +0000 | |
|---|---|---|
| committer | 2016-08-22 20:28:24 +0000 | |
| commit | bf1d4cae3b080bcd25d745ab0148d4b5b2ea620b (patch) | |
| tree | e2aaf2051946c0c13b286b9de5d6c527d6fe06e8 | |
| parent | 8499c137404465c2b186d7058954bc2338565db0 (diff) | |
| parent | c10db985f399a3257a5dcfa80c3388e8b8ee3db4 (diff) | |
Merge "Update navup button content description when it's menu." into nyc-mr1-dev
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 7d42211be5e5..682af8bd536f 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -863,4 +863,7 @@ <!-- Label for Help and feedback menu item --> <string name="help_feedback_label">Help & feedback</string> + <!-- Content description for drawer menu button [CHAR_LIMIT=30]--> + <string name="content_description_menu_button">Menu</string> + </resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java index 6658c14bd1cd..a50b366c26ac 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java @@ -226,6 +226,7 @@ public class SettingsDrawerActivity extends Activity { public void showMenuIcon() { mShowingMenu = true; getActionBar().setHomeAsUpIndicator(R.drawable.ic_menu); + getActionBar().setHomeActionContentDescription(R.string.content_description_menu_button); getActionBar().setDisplayHomeAsUpEnabled(true); } |