PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an override filter bug." into oc-dev am: 5cc0a122d3

Browse Source 
am: 23c2cf1d68

Change-Id: I88545ebb5e3a1b05268b7485c0d7dc4323ff661f
This commit is contained in:
Daniel Nishi
2017-05-30 19:54:19 +00:00
committed by android-build-merger
parent 64822d40dc 23c2cf1d68
commit 4fcb5f6b7c
2 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/applications/ManageApplications.java
View File

@@ -418,14 +418,14 @@ public class ManageApplications extends InstrumentedPreferenceFragment
mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
}
AppFilter overrideFilter = getOverrideFilter(mListType, mStorageType, mVolumeUuid);
if (overrideFilter != null) {
mApplications.setOverrideFilter(overrideFilter);
AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
if (compositeFilter != null) {
mApplications.setCompositeFilter(compositeFilter);
}
}
@VisibleForTesting
static @Nullable AppFilter getOverrideFilter(int listType, int storageType, String volumeUuid) {
static @Nullable AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) {
AppFilter filter = new VolumeFilter(volumeUuid);
if (listType == LIST_TYPE_STORAGE) {
if (storageType == STORAGE_TYPE_MUSIC) {
@@ -840,7 +840,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
private int mWhichSize = SIZE_TOTAL;
CharSequence mCurFilterPrefix;
private PackageManager mPm;
private AppFilter mOverrideFilter;
private AppFilter mCompositeFilter;
private boolean mHasReceivedLoadEntries;
private boolean mHasReceivedBridgeCallback;
private FileViewHolderController mExtraViewController;
@@ -904,8 +904,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
}
}
public void setOverrideFilter(AppFilter overrideFilter) {
mOverrideFilter = overrideFilter;
public void setCompositeFilter(AppFilter compositeFilter) {
mCompositeFilter = compositeFilter;
rebuild(true);
}
@@ -983,8 +983,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
mWhichSize = SIZE_INTERNAL;
}
filterObj = FILTERS[mFilterMode];
if (mOverrideFilter != null) {
filterObj = mOverrideFilter;
if (mCompositeFilter != null) {
filterObj = new CompoundFilter(filterObj, mCompositeFilter);
}
if (!mManageApplications.mShowSystem) {
if (LIST_TYPES_WITH_INSTANT.contains(mManageApplications.mListType)) {

43
tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
View File

@@ -20,9 +20,13 @@ import android.content.pm.ApplicationInfo;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import java.lang.reflect.Field;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,9 +37,9 @@ import static org.mockito.Mockito.mock;
@RunWith(AndroidJUnit4.class)
public class ManageApplicationsUnitTest {
@Test
public void getOverrideFilter_filtersVolumeForAudio() {
public void getCompositeFilter_filtersVolumeForAudio() {
AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_STORAGE,
ManageApplications.STORAGE_TYPE_MUSIC,
"uuid");
@@ -49,9 +53,9 @@ public class ManageApplicationsUnitTest {
}
@Test
public void getOverrideFilter_filtersVolumeForVideo() {
public void getCompositeFilter_filtersVolumeForVideo() {
AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_MOVIES,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
@@ -65,9 +69,9 @@ public class ManageApplicationsUnitTest {
}
@Test
public void getOverrideFilter_filtersVolumeForGames() {
public void getCompositeFilter_filtersVolumeForGames() {
ApplicationsState.AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_GAMES,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
@@ -81,12 +85,35 @@ public class ManageApplicationsUnitTest {
}
@Test
public void getOverrideFilter_isEmptyNormally() {
public void getCompositeFilter_isEmptyNormally() {
ApplicationsState.AppFilter filter =
ManageApplications.getOverrideFilter(
ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_MAIN,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
assertThat(filter).isNull();
}
@Test
public void getCompositeFilter_worksWithInstantApps() throws Exception {
Field field = AppUtils.class.getDeclaredField("sInstantAppDataProvider");
field.setAccessible(true);
field.set(AppUtils.class, (InstantAppDataProvider) (i -> true));
AppFilter filter =
ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_STORAGE,
ManageApplications.STORAGE_TYPE_MUSIC,
"uuid");
AppFilter composedFilter = new CompoundFilter(ApplicationsState.FILTER_INSTANT, filter);
final ApplicationInfo info = new ApplicationInfo();
info.volumeUuid = "uuid";
info.category = ApplicationInfo.CATEGORY_AUDIO;
info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
appEntry.info = info;
assertThat(composedFilter.filterApp(appEntry)).isTrue();
}
}