Merge "Encapsulate AppFilter and its display label into 1 class" (7ad17d72) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/manageapplications/AppFilterItem.java

0 → 100644

+85 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.applications.manageapplications;

			import android.support.annotation.StringRes;

			import com.android.settingslib.applications.ApplicationsState;

			import java.util.Objects;

			/**
			* Data model for a displayable app filter.
			*/
			public class AppFilterItem implements Comparable<AppFilterItem> {

			@StringRes
			private final int mTitle;
			@AppFilterRegistry.FilterType
			private final int mFilterType;
			private final ApplicationsState.AppFilter mFilter;

			public AppFilterItem(ApplicationsState.AppFilter filter,
			@AppFilterRegistry.FilterType int filterType,
			@StringRes int title) {
			mTitle = title;
			mFilterType = filterType;
			mFilter = filter;
			}

			public int getTitle() {
			return mTitle;
			}

			public ApplicationsState.AppFilter getFilter() {
			return mFilter;
			}

			public int getFilterType() {
			return mFilterType;
			}

			@Override
			public int compareTo(AppFilterItem appFilter) {
			if (appFilter == null) {
			return 1;
			}
			if (this == appFilter) {
			return 0;
			}
			return mFilterType - appFilter.mFilterType;
			}

			@Override
			public boolean equals(Object o) {
			if (o == null \|\| !(o instanceof AppFilterItem)) {
			return false;
			}
			if (this == o) {
			return true;
			}
			final AppFilterItem other = (AppFilterItem) o;
			return mTitle == other.mTitle
			&& mFilterType == other.mFilterType
			&& mFilter == other.mFilter;
			}

			@Override
			public int hashCode() {
			return Objects.hash(mFilter, mTitle, mFilterType);
			}
			}

src/com/android/settings/applications/manageapplications/AppFilterRegistry.java

0 → 100644

+188 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.applications.manageapplications;

			import android.support.annotation.IntDef;

			import com.android.settings.R;
			import com.android.settings.applications.AppStateInstallAppsBridge;
			import com.android.settings.applications.AppStateNotificationBridge;
			import com.android.settings.applications.AppStateOverlayBridge;
			import com.android.settings.applications.AppStatePowerBridge;
			import com.android.settings.applications.AppStateUsageBridge;
			import com.android.settings.applications.AppStateWriteSettingsBridge;
			import com.android.settingslib.applications.ApplicationsState;

			/**
			* A registry and helper class that manages all {@link AppFilterItem}s for ManageApplications UI.
			*/
			public class AppFilterRegistry {

			@IntDef(value = {
			FILTER_APPS_POWER_WHITELIST,
			FILTER_APPS_POWER_WHITELIST_ALL,
			FILTER_APPS_ALL,
			FILTER_APPS_ENABLED,
			FILTER_APPS_INSTANT,
			FILTER_APPS_DISABLED,
			FILTER_APPS_BLOCKED,
			FILTER_APPS_PERSONAL,
			FILTER_APPS_WORK,
			FILTER_APPS_USAGE_ACCESS,
			FILTER_APPS_WITH_OVERLAY,
			FILTER_APPS_WRITE_SETTINGS,
			FILTER_APPS_INSTALL_SOURCES,
			})
			@interface FilterType {
			}

			// Filter options used for displayed list of applications
			// Filters will appear sorted based on their value defined here.
			public static final int FILTER_APPS_POWER_WHITELIST = 0;
			public static final int FILTER_APPS_POWER_WHITELIST_ALL = 1;
			public static final int FILTER_APPS_ALL = 2;
			public static final int FILTER_APPS_ENABLED = 3;
			public static final int FILTER_APPS_INSTANT = 4;
			public static final int FILTER_APPS_DISABLED = 5;
			public static final int FILTER_APPS_BLOCKED = 6;
			public static final int FILTER_APPS_PERSONAL = 7;
			public static final int FILTER_APPS_WORK = 8;
			public static final int FILTER_APPS_USAGE_ACCESS = 9;
			public static final int FILTER_APPS_WITH_OVERLAY = 10;
			public static final int FILTER_APPS_WRITE_SETTINGS = 11;
			public static final int FILTER_APPS_INSTALL_SOURCES = 12;
			// Next id: 13

			private static AppFilterRegistry sRegistry;

			private final AppFilterItem[] mFilters;

			private AppFilterRegistry() {
			mFilters = new AppFilterItem[13];

			// High power whitelist, on
			mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
			new ApplicationsState.CompoundFilter(
			AppStatePowerBridge.FILTER_POWER_WHITELISTED,
			ApplicationsState.FILTER_ALL_ENABLED),
			FILTER_APPS_POWER_WHITELIST,
			R.string.high_power_filter_on);

			// Without disabled until used
			mFilters[FILTER_APPS_POWER_WHITELIST_ALL] = new AppFilterItem(
			new ApplicationsState.CompoundFilter(
			ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
			ApplicationsState.FILTER_ALL_ENABLED),
			FILTER_APPS_POWER_WHITELIST_ALL,
			R.string.filter_all_apps);

			// All apps
			mFilters[FILTER_APPS_ALL] = new AppFilterItem(
			ApplicationsState.FILTER_EVERYTHING,
			FILTER_APPS_ALL,
			R.string.filter_all_apps);

			// Enabled
			mFilters[FILTER_APPS_ENABLED] = new AppFilterItem(
			ApplicationsState.FILTER_ALL_ENABLED,
			FILTER_APPS_ENABLED,
			R.string.filter_enabled_apps);

			// Disabled
			mFilters[FILTER_APPS_DISABLED] = new AppFilterItem(
			ApplicationsState.FILTER_DISABLED,
			FILTER_APPS_DISABLED,
			R.string.filter_apps_disabled);

			// Instant
			mFilters[FILTER_APPS_INSTANT] = new AppFilterItem(
			ApplicationsState.FILTER_INSTANT,
			FILTER_APPS_INSTANT,
			R.string.filter_instant_apps);

			// Blocked Notifications
			mFilters[FILTER_APPS_BLOCKED] = new AppFilterItem(
			AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
			FILTER_APPS_BLOCKED,
			R.string.filter_notif_blocked_apps);

			// Personal
			mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem(
			ApplicationsState.FILTER_PERSONAL,
			FILTER_APPS_PERSONAL,
			R.string.filter_personal_apps);

			// Work
			mFilters[FILTER_APPS_WORK] = new AppFilterItem(
			ApplicationsState.FILTER_WORK,
			FILTER_APPS_WORK,
			R.string.filter_work_apps);

			// Usage access screen, never displayed.
			mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem(
			AppStateUsageBridge.FILTER_APP_USAGE,
			FILTER_APPS_USAGE_ACCESS,
			R.string.filter_all_apps);

			// Apps that can draw overlays
			mFilters[FILTER_APPS_WITH_OVERLAY] = new AppFilterItem(
			AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW,
			FILTER_APPS_WITH_OVERLAY,
			R.string.filter_overlay_apps);

			// Apps that can write system settings
			mFilters[FILTER_APPS_WRITE_SETTINGS] = new AppFilterItem(
			AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS,
			FILTER_APPS_WRITE_SETTINGS,
			R.string.filter_write_settings_apps);

			// Apps that are trusted sources of apks
			mFilters[FILTER_APPS_INSTALL_SOURCES] = new AppFilterItem(
			AppStateInstallAppsBridge.FILTER_APP_SOURCES,
			FILTER_APPS_INSTALL_SOURCES,
			R.string.filter_install_sources_apps);
			}

			public static AppFilterRegistry getInstance() {
			if (sRegistry == null) {
			sRegistry = new AppFilterRegistry();
			}
			return sRegistry;
			}

			@FilterType
			public int getDefaultFilterType(int listType) {
			switch (listType) {
			case ManageApplications.LIST_TYPE_USAGE_ACCESS:
			return FILTER_APPS_USAGE_ACCESS;
			case ManageApplications.LIST_TYPE_HIGH_POWER:
			return FILTER_APPS_POWER_WHITELIST;
			case ManageApplications.LIST_TYPE_OVERLAY:
			return FILTER_APPS_WITH_OVERLAY;
			case ManageApplications.LIST_TYPE_WRITE_SETTINGS:
			return FILTER_APPS_WRITE_SETTINGS;
			case ManageApplications.LIST_TYPE_MANAGE_SOURCES:
			return FILTER_APPS_INSTALL_SOURCES;
			default:
			return FILTER_APPS_ALL;
			}
			}

			public AppFilterItem get(@FilterType int filterType) {
			return mFilters[filterType];
			}
			}

src/com/android/settings/applications/manageapplications/ManageApplications.java

+73 −148

File changed.

Preview size limit exceeded, changes collapsed.

tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java

0 → 100644

+92 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.applications.manageapplications;

			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_BLOCKED;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_ENABLED;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_USAGE_ACCESS;
			import static com.google.common.truth.Truth.assertThat;

			import com.android.settings.R;
			import com.android.settings.TestConfig;
			import com.android.settings.applications.AppStateUsageBridge;
			import com.android.settings.testutils.SettingsRobolectricTestRunner;
			import com.android.settingslib.applications.ApplicationsState;

			import org.junit.Test;
			import org.junit.runner.RunWith;
			import org.robolectric.annotation.Config;

			@RunWith(SettingsRobolectricTestRunner.class)
			@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
			public class AppFilterItemTest {

			@Test
			public void equals_sameContent_true() {
			final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
			final AppFilterItem item2 = new AppFilterItem(
			AppStateUsageBridge.FILTER_APP_USAGE,
			FILTER_APPS_USAGE_ACCESS,
			R.string.filter_all_apps);

			// Same instance, should be same
			assertThat(item).isEqualTo(item);

			// Same content, should be same
			assertThat(item).isEqualTo(item2);
			}

			@Test
			public void compare_sameContent_return0() {
			final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
			final AppFilterItem item2 = new AppFilterItem(
			AppStateUsageBridge.FILTER_APP_USAGE,
			FILTER_APPS_USAGE_ACCESS,
			R.string.filter_all_apps);

			assertThat(item.compareTo(item)).isEqualTo(0);
			assertThat(item.compareTo(item2)).isEqualTo(0);
			assertThat(item2.compareTo(item)).isEqualTo(0);
			}

			@Test
			public void compare_toNull_return1() {
			final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
			assertThat(item.compareTo(null)).isEqualTo(1);
			}

			@Test
			public void compare_differentFilter_returnFilterDiff() {
			final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
			final AppFilterItem item2 = new AppFilterItem(
			ApplicationsState.FILTER_ALL_ENABLED,
			FILTER_APPS_ENABLED,
			R.string.filter_enabled_apps);
			assertThat(item.compareTo(item2)).isNotEqualTo(0);
			}

			@Test
			public void hash_differentItem_differentHash() {
			final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
			final AppFilterItem item2 = AppFilterRegistry.getInstance().get(FILTER_APPS_BLOCKED);

			assertThat(item.hashCode()).isNotEqualTo(item2.hashCode());
			}
			}

tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java

0 → 100644

+91 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.applications.manageapplications;

			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_ALL;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_INSTALL_SOURCES;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_POWER_WHITELIST;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_USAGE_ACCESS;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_WITH_OVERLAY;
			import static com.android.settings.applications.manageapplications.AppFilterRegistry
			.FILTER_APPS_WRITE_SETTINGS;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_GAMES;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_HIGH_POWER;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_MAIN;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_MANAGE_SOURCES;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_MOVIES;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_NOTIFICATION;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_OVERLAY;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_PHOTOGRAPHY;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_STORAGE;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_USAGE_ACCESS;
			import static com.android.settings.applications.manageapplications.ManageApplications
			.LIST_TYPE_WRITE_SETTINGS;
			import static com.google.common.truth.Truth.assertThat;

			import com.android.settings.TestConfig;
			import com.android.settings.testutils.SettingsRobolectricTestRunner;

			import org.junit.Test;
			import org.junit.runner.RunWith;
			import org.robolectric.annotation.Config;

			@RunWith(SettingsRobolectricTestRunner.class)
			@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
			public class AppFilterRegistryTest {

			@Test
			public void getDefaultType_shouldMatchForAllListType() {
			final AppFilterRegistry registry = AppFilterRegistry.getInstance();
			assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
			.isEqualTo(FILTER_APPS_USAGE_ACCESS);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
			.isEqualTo(FILTER_APPS_POWER_WHITELIST);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY)).isEqualTo(
			FILTER_APPS_WITH_OVERLAY);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS)).isEqualTo(
			FILTER_APPS_WRITE_SETTINGS);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES)).isEqualTo(
			FILTER_APPS_INSTALL_SOURCES);

			assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN))
			.isEqualTo(FILTER_APPS_ALL);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
			.isEqualTo(FILTER_APPS_ALL);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);

			assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
			assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
			}
			}