diff options
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/NavigationView.java | 8 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java | 9 |
2 files changed, 2 insertions, 15 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java b/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java index f6fe47bd908e..3373c23ed212 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java +++ b/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java @@ -147,17 +147,13 @@ 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; } - return null; } void revealRootsDrawer(boolean open) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index 0709652ec0dc..d54bdfd580eb 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -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) { |