diff options
author | Zemiao Zhu <zemiao@google.com> | 2020-08-21 13:33:54 -0700 |
---|---|---|
committer | Zemiao Zhu <zemiao@google.com> | 2020-08-27 22:22:39 +0000 |
commit | a858823fc1f0aa44cc05c92f33f7024f90a02388 (patch) | |
tree | f61e22d8983bcea5030f503785ce1b6f94f65055 | |
parent | 6bc6568df45d7f0f918a9e3b6bc0f10930bd9279 (diff) | |
download | DocumentsUI-a858823fc1f0aa44cc05c92f33f7024f90a02388.tar.gz |
Disable Documents filter for Q.
Bug: 162456200
Test: atest DocumentsUIGoogleTests
Change-Id: Iba98f8c872619afe37fe8291b108dda213e4ad2b
-rw-r--r-- | src/com/android/documentsui/queries/SearchChipViewManager.java | 9 | ||||
-rw-r--r-- | tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java | 15 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/com/android/documentsui/queries/SearchChipViewManager.java b/src/com/android/documentsui/queries/SearchChipViewManager.java index ebda22bf3..17bad12db 100644 --- a/src/com/android/documentsui/queries/SearchChipViewManager.java +++ b/src/com/android/documentsui/queries/SearchChipViewManager.java @@ -35,6 +35,7 @@ import com.android.documentsui.MetricConsts; import com.android.documentsui.R; import com.android.documentsui.base.MimeTypes; import com.android.documentsui.base.Shared; +import com.android.documentsui.util.VersionUtils; import com.google.android.material.chip.Chip; import com.google.common.primitives.Ints; @@ -96,9 +97,11 @@ public class SearchChipViewManager { static { sMimeTypesChipItems.put(TYPE_IMAGES, new SearchChipData(TYPE_IMAGES, R.string.chip_title_images, IMAGES_MIMETYPES)); - sMimeTypesChipItems.put(TYPE_DOCUMENTS, - new SearchChipData(TYPE_DOCUMENTS, R.string.chip_title_documents, - DOCUMENTS_MIMETYPES)); + if (VersionUtils.isAtLeastR()) { + sMimeTypesChipItems.put(TYPE_DOCUMENTS, + new SearchChipData(TYPE_DOCUMENTS, R.string.chip_title_documents, + DOCUMENTS_MIMETYPES)); + } sMimeTypesChipItems.put(TYPE_AUDIO, new SearchChipData(TYPE_AUDIO, R.string.chip_title_audio, AUDIO_MIMETYPES)); sMimeTypesChipItems.put(TYPE_VIDEOS, diff --git a/tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java b/tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java index 9dbef02a7..da83c38fa 100644 --- a/tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java +++ b/tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java @@ -34,6 +34,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.R; import com.android.documentsui.base.MimeTypes; import com.android.documentsui.base.Shared; +import com.android.documentsui.util.VersionUtils; import org.junit.Before; import org.junit.Test; @@ -49,6 +50,8 @@ public final class SearchChipViewManagerTest { private static final String LARGE_FILES_CHIP_MIME_TYPE = ""; private static final String FROM_THIS_WEEK_CHIP_MIME_TYPE = ""; + private static final String[] TEST_MIME_TYPES_INCLUDING_DOCUMENT = + new String[]{"image/*", "video/*", "text/*"}; private static final String[] TEST_MIME_TYPES = new String[]{"image/*", "video/*"}; private static final String[] TEST_OTHER_TYPES = @@ -88,6 +91,18 @@ public final class SearchChipViewManagerTest { } @Test + public void testUpdateChips_documentsFilterOnlyAvailableAboveR() throws Exception { + mSearchChipViewManager.updateChips(TEST_MIME_TYPES_INCLUDING_DOCUMENT); + + int totalChipLength = TEST_MIME_TYPES_INCLUDING_DOCUMENT.length + TEST_OTHER_TYPES.length; + if (VersionUtils.isAtLeastR()) { + assertThat(mChipGroup.getChildCount()).isEqualTo(totalChipLength); + } else { + assertThat(mChipGroup.getChildCount()).isEqualTo(totalChipLength - 1); + } + } + + @Test public void testUpdateChips_withSingleMimeType_hasCorrectChipCount() throws Exception { mSearchChipViewManager.updateChips(new String[]{"image/*"}); |