am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

* commit 'b5c146eef9dcbc405530ef1855d192ec59119100':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
This commit is contained in:
Zach Johnson
2015-07-28 23:33:58 +00:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -56,7 +56,7 @@ public class AppStatePowerBridge extends AppStateBaseBridge {
} }
public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter( public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter(
ApplicationsState.FILTER_PERSONAL, new AppFilter() { ApplicationsState.FILTER_PERSONAL_WITHOUT_DISABLED_UNTIL_USED, new AppFilter() {
@Override @Override
public void init() { public void init() {
} }

View File

@@ -154,7 +154,7 @@ public class ManageApplications extends InstrumentedFragment
public static final AppFilter[] FILTERS = new AppFilter[] { public static final AppFilter[] FILTERS = new AppFilter[] {
new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED, new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED,
ApplicationsState.FILTER_ALL_ENABLED), // High power whitelist, on ApplicationsState.FILTER_ALL_ENABLED), // High power whitelist, on
new CompoundFilter(ApplicationsState.FILTER_PERSONAL, new CompoundFilter(ApplicationsState.FILTER_PERSONAL_WITHOUT_DISABLED_UNTIL_USED,
ApplicationsState.FILTER_ALL_ENABLED), // All apps label, but personal filter 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