commit d2fc4cdeb3c9a8e7b49a8dd6985e7bb7aaaa0f20
author Garfield Tan <xutan@google.com> Wed Mar 15 15:39:14 2017 -0700
committer Garfield Tan <xutan@google.com> Wed Mar 15 15:54:47 2017 -0700
tree 9e15f2b15a83c70ae5d4d2c494ac75fcdf462b83
parent 390cd78b43643e42ebd177d0b55112ab66e9d963

Fix a DocsUI crash...

when user toggles multiwindow mode with an empty search widget. Also a
bit cleaning around Toolbar.

Bug: 34881838
Change-Id: Ib093ed5bf5e9f9a95d815119620ecddd84d428f7

src/com/android/documentsui/NavigationViewManager.java

diff --git a/src/com/android/documentsui/NavigationViewManager.java b/src/com/android/documentsui/NavigationViewManager.java
index 694381e..f0faaa4 100644
--- a/src/com/android/documentsui/NavigationViewManager.java
+++ b/src/com/android/documentsui/NavigationViewManager.java
@@ -22,6 +22,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import android.view.View;
+import android.widget.Toolbar;
 
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.State;
@@ -36,15 +37,15 @@
 
     private static final String TAG = "NavigationViewManager";
 
-    final DrawerController mDrawer;
-    final DocumentsToolbar mToolbar;
-    final State mState;
-    final NavigationViewManager.Environment mEnv;
-    final Breadcrumb mBreadcrumb;
+    private final DrawerController mDrawer;
+    private final Toolbar mToolbar;
+    private final State mState;
+    private final NavigationViewManager.Environment mEnv;
+    private final Breadcrumb mBreadcrumb;
 
     public NavigationViewManager(
             DrawerController drawer,
-            DocumentsToolbar toolbar,
+            Toolbar toolbar,
             State state,
             NavigationViewManager.Environment env,
             Breadcrumb breadcrumb) {