From 94f9c824c42f209f363c3ae8d637c909790e36b5 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 21 Jul 2015 09:30:18 -0400 Subject: [PATCH] Don't show disabled apps in ignore optimizations Bug: 22612760 Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d --- src/com/android/settings/applications/ManageApplications.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 3820123c9c..ce2dbe0f10 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -152,8 +152,10 @@ public class ManageApplications extends InstrumentedFragment // This is the actual mapping to filters from FILTER_ constants above, the order must // be kept in sync. public static final AppFilter[] FILTERS = new AppFilter[] { - AppStatePowerBridge.FILTER_POWER_WHITELISTED, // High power whitelist, on - ApplicationsState.FILTER_PERSONAL, // All apps label, but personal filter + new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED, + ApplicationsState.FILTER_ALL_ENABLED), // High power whitelist, on + new CompoundFilter(ApplicationsState.FILTER_PERSONAL, + ApplicationsState.FILTER_ALL_ENABLED), // All apps label, but personal filter ApplicationsState.FILTER_EVERYTHING, // All apps ApplicationsState.FILTER_ALL_ENABLED, // Enabled ApplicationsState.FILTER_DISABLED, // Disabled @@ -617,6 +619,9 @@ public class ManageApplications extends InstrumentedFragment } public void setHasDisabled(boolean hasDisabledApps) { + if (mListType == LIST_TYPE_HIGH_POWER) { + return; + } mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps); mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps); } -- 2.11.0