Merge "[DocsUI M3] Remove the break between folders and files" into main

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java b/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java
index 8989853a0..8be400924 100644
--- a/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java
+++ b/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java
@@ -16,6 +16,8 @@
 
 package com.android.documentsui.dirlist;
 
+import static com.android.documentsui.util.FlagUtils.isUseMaterial3FlagEnabled;
+
 import android.os.UserManager;
 import android.view.ViewGroup;
 
@@ -207,6 +209,11 @@ final class DirectoryAddonsAdapter extends DocumentsAdapter {
             return;
         }
 
+        if (isUseMaterial3FlagEnabled()) {
+            // Do not add a visual break between folders and documents in Material3.
+            return;
+        }
+
         // Walk down the list of IDs till we encounter something that's not a directory, and
         // insert a whitespace element - this introduces a visual break in the grid between
         // folders and documents.