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

Commit 3d45ca98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 0e4d7f14 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186630

Change-Id: Id775f8149896692804a6a35db9a20ea851d38ac4
parents 570a78e9 0e4d7f14

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+18 −0
Original line number Diff line number Diff line
@@ -2027,6 +2027,7 @@ public class ApplicationsState { 
                }

            };



    /* For the Storage Settings which shows category of app types. */

    public static final AppFilter FILTER_OTHER_APPS =

            new AppFilter() {

                @Override
@@ -2046,4 +2047,21 @@ public class ApplicationsState { 
                    return !isCategorized;

                }

            };



    /* For the Storage Settings which shows category of file types. */

    public static final AppFilter FILTER_APPS_EXCEPT_GAMES =

            new AppFilter() {

                @Override

                public void init() {

                }



                @Override

                public boolean filterApp(AppEntry entry) {

                    boolean isCategorized;

                    synchronized (entry) {

                        isCategorized = FILTER_GAMES.filterApp(entry);

                    }

                    return !isCategorized;

                }

            };

}

packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java

+28 −0
Original line number Diff line number Diff line
@@ -137,6 +137,34 @@ public class ApplicationsStateTest { 
        assertThat(ApplicationsState.FILTER_PHOTOS.filterApp(mEntry)).isFalse();

    }



    @Test

    public void testAppsExceptGamesFilterRejectsGame() {

        mEntry.info.category = ApplicationInfo.CATEGORY_GAME;



        assertThat(ApplicationsState.FILTER_APPS_EXCEPT_GAMES.filterApp(mEntry)).isFalse();

    }



    @Test

    public void testAppsExceptGamesFilterAcceptsImage() {

        mEntry.info.category = ApplicationInfo.CATEGORY_IMAGE;



        assertThat(ApplicationsState.FILTER_APPS_EXCEPT_GAMES.filterApp(mEntry)).isTrue();

    }



    @Test

    public void testAppsExceptGamesFilterAcceptsVideo() {

        mEntry.info.category = ApplicationInfo.CATEGORY_VIDEO;



        assertThat(ApplicationsState.FILTER_APPS_EXCEPT_GAMES.filterApp(mEntry)).isTrue();

    }



    @Test

    public void testAppsExceptGamesFilterAcceptsAudio() {

        mEntry.info.category = ApplicationInfo.CATEGORY_AUDIO;



        assertThat(ApplicationsState.FILTER_APPS_EXCEPT_GAMES.filterApp(mEntry)).isTrue();

    }



    @Test

    public void testDownloadAndLauncherAndInstantAcceptsCorrectApps() {

        // should include instant apps