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

Commit 54cb196c authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am: 8499c137 

am: a902d61e

Change-Id: I2940f8700c71a29ded2a68d43a3845e03e0b7c4e
parents bb79b6db a902d61e

packages/SettingsLib/res/values/strings.xml

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

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

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

    }