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

am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev

Browse Source 
* commit '9b6ff57eb550215c30a16225e59a2c4d0af7de92':
  Don't show disabled apps in ignore optimizations
This commit is contained in:
Jason Monk
2015-07-24 03:26:29 +00:00
committed by Android Git Automerger
parent 5ea94a9c4d 9b6ff57eb5
commit c19eac29b6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,8 +152,10 @@ public class ManageApplications extends InstrumentedFragment
// This is the actual mapping to filters from FILTER_ constants above, the order must // This is the actual mapping to filters from FILTER_ constants above, the order must
// be kept in sync. // be kept in sync.
public static final AppFilter[] FILTERS = new AppFilter[] { public static final AppFilter[] FILTERS = new AppFilter[] {
AppStatePowerBridge.FILTER_POWER_WHITELISTED, // High power whitelist, on new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED,
ApplicationsState.FILTER_PERSONAL, // All apps label, but personal filter 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_EVERYTHING, // All apps
ApplicationsState.FILTER_ALL_ENABLED, // Enabled ApplicationsState.FILTER_ALL_ENABLED, // Enabled
ApplicationsState.FILTER_DISABLED, // Disabled ApplicationsState.FILTER_DISABLED, // Disabled
@@ -617,6 +619,9 @@ public class ManageApplications extends InstrumentedFragment
} }
public void setHasDisabled(boolean hasDisabledApps) { public void setHasDisabled(boolean hasDisabledApps) {
if (mListType == LIST_TYPE_HIGH_POWER) {
return;
}
mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps); mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps);
mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps); mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
} }