| commit | c10db985f399a3257a5dcfa80c3388e8b8ee3db4 | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Thu Aug 11 13:52:04 2016 -0700 |
| committer | Fan Zhang <zhfan@google.com> | Mon Aug 22 18:32:00 2016 +0000 |
| tree | e178b0582d10082032c31b0c005c565bc37bd419 | |
| parent | f9f8e8204504307ee7e7f2a372c58a44043893b3 [diff] |
Update navup button content description when it's menu. Bug: 30090247 Change-Id: I2ff9529a3dd5f197f2d142ef2993d5d8e90b5645 (cherry picked from commit df915bbbb9d97bdb10185a5b0280ffa0b9582694)
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 7d42211..682af8b 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 6658c14..a50b366 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 void showMenuIcon() { mShowingMenu = true; getActionBar().setHomeAsUpIndicator(R.drawable.ic_menu); + getActionBar().setHomeActionContentDescription(R.string.content_description_menu_button); getActionBar().setDisplayHomeAsUpEnabled(true); }