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

Commit 45c23fa6 authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Add support for movies & tv apps querying. 

Bug: 36223441
Test: Robotest
Change-Id: Icbb9b8947112f45d37858ceb5cfb1d76f06bda32
Merged-In: Icfb34844601f87d11b7309eacf9385d49ed36338
parent 1a199ba7

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

+17 −1
Original line number Diff line number Diff line
@@ -1601,6 +1601,21 @@ public class ApplicationsState { 
        }

    };



    public static final AppFilter FILTER_MOVIES = new AppFilter() {

        @Override

        public void init() {

        }



        @Override

        public boolean filterApp(AppEntry entry) {

            boolean isMovieApp;

            synchronized(entry) {

                isMovieApp = entry.info.category == ApplicationInfo.CATEGORY_VIDEO;

            }

            return isMovieApp;

        }

    };



    public static final AppFilter FILTER_OTHER_APPS = new AppFilter() {

        @Override

        public void init() {
@@ -1611,7 +1626,8 @@ public class ApplicationsState { 
            boolean isCategorized;

            synchronized(entry) {

                isCategorized = entry.info.category == ApplicationInfo.CATEGORY_AUDIO ||

                    entry.info.category == ApplicationInfo.CATEGORY_GAME;

                    entry.info.category == ApplicationInfo.CATEGORY_GAME ||

                    entry.info.category == ApplicationInfo.CATEGORY_VIDEO;

            }

            return !isCategorized;

        }

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

+14 −0
Original line number Diff line number Diff line
@@ -200,4 +200,18 @@ public class ApplicationsStateTest { 
        when(mEntry.info.isInstantApp()).thenReturn(true);

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

    }



    @Test

    public void testVideoFilterAcceptsCategorizedVideo() {

        mEntry.info.category = ApplicationInfo.CATEGORY_VIDEO;



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

    }



    @Test

    public void testVideosFilterRejectsNotVideo() {

        mEntry.info.category = ApplicationInfo.CATEGORY_GAME;



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

    }

}

proto/src/metrics_constants.proto

+5 −0
Original line number Diff line number Diff line
@@ -3906,6 +3906,11 @@ message MetricsEvent { 
    // OS: O

    FINGERPRINT_REMOVE_SIDECAR = 934;



    // OPEN: Settings > Storage > Movies & TV

    // CATEGORY: SETTINGS

    // OS: O

    APPLICATIONS_STORAGE_MOVIES = 935;



    // ---- End O Constants, all O constants go above this line ----



    // Add new aosp constants above this line.