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

Commit 7d330757 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 

* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions
parents 36aad060 2fd1d454

core/java/android/widget/Toolbar.java

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ public class Toolbar extends ViewGroup { 
     */

    public void setNavigationContentDescription(int resId) {

        ensureNavButtonView();

        mNavButtonView.setContentDescription(getContext().getText(resId));

        mNavButtonView.setContentDescription(resId != 0 ? getContext().getText(resId) : null);

    }



    /**