Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev am: bce83f8c71

am: eba886f045

Change-Id: Ib1b6f17ef73222cfeebe163c6a43112f74ffa898
This commit is contained in:
Daniel Nishi
2017-07-12 17:33:32 +00:00
committed by android-build-merger
3 changed files with 22 additions and 2 deletions

View File

@@ -215,8 +215,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
}
// Storage types. Used to determine what the extra item in the list of preferences is.
public static final int STORAGE_TYPE_DEFAULT = 0;
public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
public static final int STORAGE_TYPE_MUSIC = 1;
public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.
// sort order
private int mSortOrder = R.id.sort_order_alpha;
@@ -434,7 +435,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
if (listType == LIST_TYPE_STORAGE) {
if (storageType == STORAGE_TYPE_MUSIC) {
filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
} else {
} else if (storageType == STORAGE_TYPE_DEFAULT) {
filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
}
return filter;