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

Merge "Filter on volume for category storage view." into oc-dev am: a41a190ac3

Browse Source 
am: 854acc9e4b

Change-Id: I21c985df9ee34981b47c080756df5dc442f335b6
This commit is contained in:
Daniel Nishi
2017-05-02 17:09:37 +00:00
committed by android-build-merger
parent dfcee96122 854acc9e4b
commit cbeebe1b6c
2 changed files with 93 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,20 +416,28 @@ public class ManageApplications extends InstrumentedPreferenceFragment
if (mListType == LIST_TYPE_HIGH_POWER) {
mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
}
if (mListType == LIST_TYPE_STORAGE) {
AppFilter filter = new VolumeFilter(mVolumeUuid);
if (mStorageType == STORAGE_TYPE_MUSIC) {
// Storage filters below.
mApplications.setOverrideFilter(getStorageFilter(mListType, mStorageType, mVolumeUuid));
}
@VisibleForTesting
static AppFilter getStorageFilter(int listType, int storageType, String volumeUuid) {
AppFilter filter = new VolumeFilter(volumeUuid);
if (listType == LIST_TYPE_STORAGE) {
if (storageType == STORAGE_TYPE_MUSIC) {
filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
} else {
filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
}
mApplications.setOverrideFilter(filter);
return filter;
}
if (mListType == LIST_TYPE_GAMES) {
mApplications.setOverrideFilter(ApplicationsState.FILTER_GAMES);
} else if (mListType == LIST_TYPE_MOVIES) {
mApplications.setOverrideFilter(ApplicationsState.FILTER_MOVIES);
if (listType == LIST_TYPE_GAMES) {
return new CompoundFilter(ApplicationsState.FILTER_GAMES, filter);
} else if (listType == LIST_TYPE_MOVIES) {
return new CompoundFilter(ApplicationsState.FILTER_MOVIES, filter);
}
return filter;
}
private int getDefaultFilter() {