Moving Menu-related logic from BaseActivity to MenuManager.

Bug: 29423149
Change-Id: I228e1525cb82d310b16ef0aec8acb4534b7b601d
(cherry picked from commit d896dc7b487771f7d5329feb01ac7c3355fce9ed)

1 files changed, 11 insertions, 21 deletions

diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java b/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
index c639f1acaf9e..78d95f64f611 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
@@ -16,15 +16,21 @@
 
 package com.android.documentsui;
 
+import static com.android.documentsui.State.ACTION_CREATE;
+import static com.android.documentsui.State.ACTION_GET_CONTENT;
+import static com.android.documentsui.State.ACTION_OPEN;
+import static com.android.documentsui.State.ACTION_OPEN_TREE;
+import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
+
 import android.view.Menu;
 import android.view.MenuItem;
 
-final class FilesMenuManager extends MenuManager {
+import com.android.documentsui.MenuManager.DirectoryDetails;
 
-    private final SearchViewManager mSearchManager;
+final class FilesMenuManager extends MenuManager {
 
-    public FilesMenuManager(SearchViewManager searchManager) {
-        mSearchManager = searchManager;
+    public FilesMenuManager(SearchViewManager searchManager, State displayState) {
+        super(searchManager, displayState);
     }
 
     @Override
@@ -36,17 +42,6 @@ final class FilesMenuManager extends MenuManager {
     }
 
     @Override
-    void updateModePicker(MenuItem grid, MenuItem list, DirectoryDetails directoryDetails) {
-        //assert(!grid.isVisible());
-        //assert(list.isVisible());
-    }
-
-    @Override
-    void updateFileSize(MenuItem fileSize, DirectoryDetails directoryDetails) {
-        //assert(fileSize.isVisible());
-    }
-
-    @Override
     void updateSettings(MenuItem settings, DirectoryDetails directoryDetails) {
         settings.setVisible(directoryDetails.hasRootSettings());
     }
@@ -70,7 +65,7 @@ final class FilesMenuManager extends MenuManager {
 
     @Override
     void updateSelectAll(MenuItem selectAll, SelectionDetails selectionDetails) {
-        assert(selectAll.isVisible());
+        selectAll.setVisible(true);
     }
 
     @Override
@@ -80,11 +75,6 @@ final class FilesMenuManager extends MenuManager {
     }
 
     @Override
-    void updateOpen(MenuItem open, SelectionDetails selectionDetails) {
-        open.setVisible(false);
-    }
-
-    @Override
     void updateShare(MenuItem share, SelectionDetails selectionDetails) {
         share.setVisible(!selectionDetails.containsDirectories()
                 && !selectionDetails.containsPartialFiles());