diff options
author | 2019-04-11 12:08:36 +0800 | |
---|---|---|
committer | 2019-04-11 12:10:57 +0800 | |
commit | 6d6ac1deaa8e110cb0c2e01f268cdf745126f65a (patch) | |
tree | a275fe4d83f3d0b45ae80790cfa0f81bbd311e79 | |
parent | e8b5fce4551d8b0e2f516e1e2f901c9b73fc0fa5 (diff) |
Make global search file not movable
In current multi root loader design, it cannot delete file,
make them not movable first to avoid confuse user.
Fix: 130233470
Test: atest DocumentsUIGoogleTests
Change-Id: Ic13f1c3112411523820c3caa44c0b358866655d8
3 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/documentsui/MultiRootDocumentsLoader.java b/src/com/android/documentsui/MultiRootDocumentsLoader.java index 36e3e9f1e..777efe0b6 100644 --- a/src/com/android/documentsui/MultiRootDocumentsLoader.java +++ b/src/com/android/documentsui/MultiRootDocumentsLoader.java @@ -264,7 +264,7 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory } protected boolean isDocumentsMovable() { - return true; + return false; } protected abstract QueryTask getQueryTask(String authority, List<RootInfo> rootInfos); diff --git a/src/com/android/documentsui/RecentsLoader.java b/src/com/android/documentsui/RecentsLoader.java index 4d29f7861..f9eacaa0a 100644 --- a/src/com/android/documentsui/RecentsLoader.java +++ b/src/com/android/documentsui/RecentsLoader.java @@ -65,11 +65,6 @@ public class RecentsLoader extends MultiRootDocumentsLoader { } @Override - protected boolean isDocumentsMovable() { - return false; - } - - @Override protected QueryTask getQueryTask(String authority, List<RootInfo> rootInfos) { return new RecentsTask(authority, rootInfos); } diff --git a/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java b/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java index d0b8f1731..0770e02de 100644 --- a/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java +++ b/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java @@ -157,7 +157,7 @@ public class GlobalSearchLoaderTest { } @Test - public void testSearchResult_isMovable() { + public void testSearchResult_isNotMovable() { final DirectoryResult result = mLoader.loadInBackground(); final Cursor c = result.cursor; @@ -165,7 +165,9 @@ public class GlobalSearchLoaderTest { c.moveToNext(); final int flags = c.getInt(c.getColumnIndex(Document.COLUMN_FLAGS)); - assertEquals(FILE_FLAG, flags); + assertEquals(0, flags & Document.FLAG_SUPPORTS_DELETE); + assertEquals(0, flags & Document.FLAG_SUPPORTS_REMOVE); + assertEquals(0, flags & Document.FLAG_SUPPORTS_MOVE); } @Test |