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

Commit e5454c69 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 

* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
parents 01398535 738d8a56

src/com/android/documentsui/DocumentsActivity.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -421,9 +421,11 @@ public class DocumentsActivity extends Activity { 
        if (showRootIcon) {

        if (showRootIcon) {

            mToolbar.setNavigationIcon(

            mToolbar.setNavigationIcon(

                    root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null);

                    root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null);

            mToolbar.setNavigationContentDescription(R.string.drawer_open);

            mToolbar.setNavigationOnClickListener(null);

            mToolbar.setNavigationOnClickListener(null);

        } else {

        } else {

            mToolbar.setNavigationIcon(R.drawable.ic_hamburger);

            mToolbar.setNavigationIcon(R.drawable.ic_hamburger);

            mToolbar.setNavigationContentDescription(R.string.drawer_open);

            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {

            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {

                @Override

                @Override

                public void onClick(View v) {

                public void onClick(View v) {