Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b247fee1 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Merge "Disable Documents filter for Q." am: 52f8d4ed 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/12424355

Change-Id: Ic85e07702ea1723863a58206f70b124d866537f5
parents e23a08d9 52f8d4ed

src/com/android/documentsui/queries/SearchChipViewManager.java

+6 −3
Original line number Diff line number Diff line
@@ -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));

        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,

tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java

+15 −0
Original line number Diff line number Diff line
@@ -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 =
@@ -87,6 +90,18 @@ public final class SearchChipViewManagerTest { 
        assertThat(mChipGroup.getChildCount()).isEqualTo(totalChipLength);

    }



    @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/*"});