diff options
author | Jason Monk <jmonk@google.com> | 2015-07-24 03:10:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:10:05 +0000 |
commit | 9b6ff57eb550215c30a16225e59a2c4d0af7de92 (patch) | |
tree | 9b86f44dd0236a09c78f4147b076257c96d2d907 /src/com/android/settings/applications | |
parent | b91da24db774829315087af3af09c90e89f496cb (diff) | |
parent | a119087b8ba24e930d982c30a039f7c4204fc435 (diff) | |
download | packages_apps_Settings-9b6ff57eb550215c30a16225e59a2c4d0af7de92.zip packages_apps_Settings-9b6ff57eb550215c30a16225e59a2c4d0af7de92.tar.gz packages_apps_Settings-9b6ff57eb550215c30a16225e59a2c4d0af7de92.tar.bz2 |
am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
Don't show disabled apps in ignore optimizations
Diffstat (limited to 'src/com/android/settings/applications')
-rw-r--r-- | src/com/android/settings/applications/ManageApplications.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 3820123..ce2dbe0 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); } |