Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update navup button content description when it's menu." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-22 20:28:22 +00:00
committed by Android (Google) Code Review
parent 8499c13740 c10db985f3
commit bf1d4cae3b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/res/values/strings.xml
View File

@@ -863,4 +863,7 @@
<!-- Label for Help and feedback menu item --> <!-- Label for Help and feedback menu item -->
<string name="help_feedback_label">Help &amp; feedback</string> <string name="help_feedback_label">Help &amp; feedback</string>
<!-- Content description for drawer menu button [CHAR_LIMIT=30]-->
<string name="content_description_menu_button">Menu</string>
</resources> </resources>

1
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
View File

@@ -226,6 +226,7 @@ public class SettingsDrawerActivity extends Activity {
public void showMenuIcon() { public void showMenuIcon() {
mShowingMenu = true; mShowingMenu = true;
getActionBar().setHomeAsUpIndicator(R.drawable.ic_menu); getActionBar().setHomeAsUpIndicator(R.drawable.ic_menu);
getActionBar().setHomeActionContentDescription(R.string.content_description_menu_button);
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
} }