Merge "Remove the toolbar icon from DocumentsUI." into nyc-dev (c1e1e414) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/src/com/android/documentsui/NavigationView.java

+2 −6

Original line number	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() {
		if (mDrawer.isPresent()) {
		return mToolbar.getContext().getDrawable(R.drawable.ic_hamburger);
		} else {
		RootInfo root = mEnv.getCurrentRoot();
		if (root != null) {
		return root.loadToolbarIcon(mToolbar.getContext());
		}
		}
		return null;
		}
		}

		void revealRootsDrawer(boolean open) {
		mDrawer.setOpen(open);

+0 −9

Original line number	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
		public boolean equals(Object o) {
		if (o == null) {