2 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/documentsui/MenuManager.java b/src/com/android/documentsui/MenuManager.java
index 5f17d7e02..eb4f98aab 100644
--- a/src/com/android/documentsui/MenuManager.java
+++ b/src/com/android/documentsui/MenuManager.java
@@ -25,6 +25,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 
@@ -183,6 +184,11 @@ public abstract class MenuManager {
         updateRename(rename, selectionDetails);
         updateViewInOwner(viewInOwner, selectionDetails);
 
+        if (isZipNgFlagEnabled()) {
+            updateExtractHere(menu.findItem(R.id.dir_menu_extract_here), selectionDetails);
+            updateBrowse(menu.findItem(R.id.dir_menu_browse), selectionDetails);
+        }
+
         updateContextMenu(menu, selectionDetails);
     }
 
@@ -383,6 +389,14 @@ public abstract class MenuManager {
         Menus.setEnabledAndVisible(extractTo, false);
     }
 
+    protected void updateExtractHere(@NonNull MenuItem it, SelectionDetails selection) {
+        Menus.setEnabledAndVisible(it, false);
+    }
+
+    protected void updateBrowse(@NonNull MenuItem it, SelectionDetails selection) {
+        Menus.setEnabledAndVisible(it, false);
+    }
+
     protected void updatePasteInto(MenuItem pasteInto, SelectionDetails selectionDetails) {
         Menus.setEnabledAndVisible(pasteInto, false);
     }
diff --git a/src/com/android/documentsui/util/FlagUtils.kt b/src/com/android/documentsui/util/FlagUtils.kt
index eee51be89..22febc317 100644
--- a/src/com/android/documentsui/util/FlagUtils.kt
+++ b/src/com/android/documentsui/util/FlagUtils.kt
@@ -31,7 +31,7 @@ class FlagUtils {
 
         @JvmStatic
         fun isZipNgFlagEnabled(): Boolean {
-            return Flags.zipNgRo()
+            return Flags.zipNgRo() && Flags.useMaterial3()
         }
 
         @JvmStatic