Merge "Hide Wifi and Systemui in settings main page" into oc-dev

This commit is contained in:
Lei Yu
2017-03-30 01:14:35 +00:00
committed by Android (Google) Code Review
4 changed files with 31 additions and 10 deletions

View File

@@ -598,8 +598,11 @@ public class PowerUsageSummary extends PowerUsageBase {
boolean shouldHideSipper(BatterySipper sipper) {
final DrainType drainType = sipper.drainType;
return drainType == DrainType.IDLE || drainType == DrainType.CELL
|| drainType == DrainType.SCREEN || drainType == DrainType.BLUETOOTH
return drainType == DrainType.IDLE
|| drainType == DrainType.CELL
|| drainType == DrainType.WIFI
|| drainType == DrainType.SCREEN
|| drainType == DrainType.BLUETOOTH
|| (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP
|| mPowerFeatureProvider.isTypeService(sipper)
|| mPowerFeatureProvider.isTypeSystem(sipper);