From c10db985f399a3257a5dcfa80c3388e8b8ee3db4 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 11 Aug 2016 13:52:04 -0700
Subject: [PATCH] Update navup button content description when it's menu.

Bug: 30090247
Change-Id: I2ff9529a3dd5f197f2d142ef2993d5d8e90b5645
(cherry picked from commit df915bbbb9d97bdb10185a5b0280ffa0b9582694)
---
 packages/SettingsLib/res/values/strings.xml                    | 3 +++
 .../com/android/settingslib/drawer/SettingsDrawerActivity.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 7d42211be5e59..682af8bd536f5 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 &amp; 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 6658c14bd1cdd..a50b366c26acd 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);
     }