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

Commit c991ce90 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by android-build-merger
Browse files

Merge "Remove the toolbar icon from DocumentsUI." into nyc-dev 

am: c1e1e41

* commit 'c1e1e41471a98a79097a75933d03dbc785aa973f':
  Remove the toolbar icon from DocumentsUI.

Change-Id: I4210d6464cd9ff32de9d3ec2bbe32950e01d9740
parents a36f48e0 8e0c4e3a

src/com/android/documentsui/NavigationView.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -147,18 +147,14 @@ class NavigationView { 
        }

        }

    }

    }





    // Hamburger if drawer is present, else root icon, or sad nullness.

    // Hamburger if drawer is present, else sad nullness.

    private @Nullable Drawable getActionBarIcon() {

    private @Nullable Drawable getActionBarIcon() {

        if (mDrawer.isPresent()) {

        if (mDrawer.isPresent()) {

            return mToolbar.getContext().getDrawable(R.drawable.ic_hamburger);

            return mToolbar.getContext().getDrawable(R.drawable.ic_hamburger);

        } else {

        } else {

            RootInfo root = mEnv.getCurrentRoot();

            if (root != null) {

                return root.loadToolbarIcon(mToolbar.getContext());

            }

        }

            return null;

            return null;

        }

        }

    }





    void revealRootsDrawer(boolean open) {

    void revealRootsDrawer(boolean open) {

        mDrawer.setOpen(open);

        mDrawer.setOpen(open);

src/com/android/documentsui/model/RootInfo.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -334,15 +334,6 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> { 
        }

        }

    }

    }





    public Drawable loadToolbarIcon(Context context) {

        if (derivedIcon != 0) {

            return IconUtils.applyTintAttr(context, derivedIcon,

                    android.R.attr.colorControlNormal);

        } else {

            return IconUtils.loadPackageIcon(context, authority, icon);

        }

    }



    @Override

    @Override

    public boolean equals(Object o) {

    public boolean equals(Object o) {

        if (o == null) {

        if (o == null) {