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

Commit 4173a89d authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 61a826ef: am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 

* commit '61a826ef':
  Fix ActionBar#setHomeActionContentDescription(0)
parents 82d11c84 61a826ef

core/java/com/android/internal/widget/ActionBarView.java

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ public class ActionBarView extends AbsActionBarView { 


    public void setHomeActionContentDescription(int resId) {

        mHomeDescriptionRes = resId;

        mHomeDescription = getResources().getText(resId);

        mHomeDescription = resId != 0 ? getResources().getText(resId) : null;

    }



    static class SavedState extends BaseSavedState {