Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd8961a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update navup button content description when it's menu."

parents 2eafc97b df915bbb

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -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>

packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -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);

    }

    }