3 files changed, 11 insertions, 7 deletions
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index ba50cfb32..89e9bc2d6 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -21,6 +21,7 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString;
 import static com.android.documentsui.base.SharedMinimal.DEBUG;
 import static com.android.documentsui.util.FlagUtils.isDesktopFileHandlingFlagEnabled;
 import static com.android.documentsui.util.FlagUtils.isUseSearchV2FlagEnabled;
+import static com.android.documentsui.util.FlagUtils.isZipNgFlagEnabled;
 
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
@@ -458,17 +459,17 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
 
     private boolean viewDocument(DocumentInfo doc) {
         if (doc.isPartial()) {
-            Log.w(TAG, "Can't view partial file.");
+            Log.w(TAG, "Cannot view partial file");
             return false;
         }
 
-        if (doc.isInArchive()) {
-            Log.w(TAG, "Can't view files in archives.");
+        if (!isZipNgFlagEnabled() && doc.isInArchive()) {
+            Log.w(TAG, "Cannot view file in archive");
             return false;
         }
 
         if (doc.isDirectory()) {
-            Log.w(TAG, "Can't view directories.");
+            Log.w(TAG, "Cannot view directory");
             return true;
         }
 
diff --git a/src/com/android/documentsui/base/DocumentInfo.java b/src/com/android/documentsui/base/DocumentInfo.java
index ad09c45cf..6306f14f1 100644
--- a/src/com/android/documentsui/base/DocumentInfo.java
+++ b/src/com/android/documentsui/base/DocumentInfo.java
@@ -17,6 +17,7 @@
 package com.android.documentsui.base;
 
 import static com.android.documentsui.base.SharedMinimal.DEBUG;
+import static com.android.documentsui.util.FlagUtils.isZipNgFlagEnabled;
 
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
@@ -319,7 +320,8 @@ public class DocumentInfo implements Durable, Parcelable {
 
     // Containers are documents which can be opened in DocumentsUI as folders.
     public boolean isContainer() {
-        return isDirectory() || (isArchive() && !isInArchive() && !isPartial());
+        return isDirectory() || (isArchive() && !isPartial() && (isZipNgFlagEnabled()
+                || !isInArchive()));
     }
 
     public boolean isVirtual() {
@@ -342,7 +344,6 @@ public class DocumentInfo implements Durable, Parcelable {
         return userId.buildDocumentUriAsUser(authority, documentId);
     }
 
-
     /**
      * Returns a tree document uri representing this {@link DocumentInfo}. The URI may contain user
      * information. Use this when uri is needed externally.
diff --git a/src/com/android/documentsui/dirlist/SelectionMetadata.java b/src/com/android/documentsui/dirlist/SelectionMetadata.java
index 0559a3b80..0d0644502 100644
--- a/src/com/android/documentsui/dirlist/SelectionMetadata.java
+++ b/src/com/android/documentsui/dirlist/SelectionMetadata.java
@@ -18,6 +18,7 @@ package com.android.documentsui.dirlist;
 
 import static com.android.documentsui.base.DocumentInfo.getCursorInt;
 import static com.android.documentsui.base.DocumentInfo.getCursorString;
+import static com.android.documentsui.util.FlagUtils.isZipNgFlagEnabled;
 
 import android.database.Cursor;
 import android.provider.DocumentsContract.Document;
@@ -184,6 +185,7 @@ public class SelectionMetadata extends SelectionObserver<String>
 
     @Override
     public boolean canOpen() {
-        return size() == 1 && mDirectoryCount == 0 && mInArchiveCount == 0 && mPartialCount == 0;
+        return mFileCount == 1 && mDirectoryCount == 0 && mPartialCount == 0 && (
+                isZipNgFlagEnabled() || mInArchiveCount == 0);
     }
 }