Merge "Add a photos app filter and a metric for using it." into oc-mr1-dev (55cd5e18) · Commits · e / os / android_frameworks_base

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -1638,6 +1638,21 @@ public class ApplicationsState {
		}
		};

		public static final AppFilter FILTER_PHOTOS =
		new AppFilter() {
		@Override
		public void init() {}

		@Override
		public boolean filterApp(AppEntry entry) {
		boolean isPhotosApp;
		synchronized (entry) {
		isPhotosApp = entry.info.category == ApplicationInfo.CATEGORY_IMAGE;
		}
		return isPhotosApp;
		}
		};

		public static final AppFilter FILTER_OTHER_APPS =
		new AppFilter() {
		@Override

+21 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,27 @@ public class ApplicationsStateTest {
		assertThat(ApplicationsState.FILTER_OTHER_APPS.filterApp(mEntry)).isTrue();
		}

		@Test
		public void testPhotosFilterAcceptsFilter() {
		mEntry.info.category = ApplicationInfo.CATEGORY_IMAGE;

		assertThat(ApplicationsState.FILTER_PHOTOS.filterApp(mEntry)).isTrue();
		}

		@Test
		public void testPhotosFilterRejectsNotPhotos() {
		mEntry.info.category = ApplicationInfo.CATEGORY_VIDEO;

		assertThat(ApplicationsState.FILTER_PHOTOS.filterApp(mEntry)).isFalse();
		}

		@Test
		public void testPhotosFilterRejectsDefaultCategory() {
		mEntry.info.category = ApplicationInfo.CATEGORY_UNDEFINED;

		assertThat(ApplicationsState.FILTER_PHOTOS.filterApp(mEntry)).isFalse();
		}

		@Test
		public void testDownloadAndLauncherAndInstantAcceptsCorrectApps() {
		// should include instant apps

+5 −0

Original line number	Diff line number	Diff line
		@@ -4282,6 +4282,11 @@ message MetricsEvent {
		// the app transition.
		APP_TRANSITION_REPORTED_DRAWN_MS = 1091;

		// OPEN: Settings > Storage > Photos & Videos
		// CATEGORY: SETTINGS
		// OS: O MR
		APPLICATIONS_STORAGE_PHOTOS = 1092;

		// Add new aosp constants above this line.
		// END OF AOSP CONSTANTS
		}