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

Merge "Hide User category if only one user in device" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-18 03:21:54 +00:00
committed by Android (Google) Code Review
parent 89bc5b2bff cdba2e7266
commit 55a3944dbf
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -218,12 +218,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@VisibleForTesting
boolean shouldHideCategory(PowerUsageData powerUsageData) {
if (powerUsageData.usageType == UsageType.UNACCOUNTED
|| powerUsageData.usageType == UsageType.OVERCOUNTED) {
return true;
}
return false;
return powerUsageData.usageType == UsageType.UNACCOUNTED
|| powerUsageData.usageType == UsageType.OVERCOUNTED
|| (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1);
}
@VisibleForTesting
@@ -316,6 +313,10 @@ public class PowerUsageAdvanced extends PowerUsageBase {
void setPowerUsageFeatureProvider(PowerUsageFeatureProvider provider) {
mPowerUsageFeatureProvider = provider;
}
@VisibleForTesting
void setUserManager(UserManager userManager) {
mUserManager = userManager;
}
/**
* Class that contains data used in {@link PowerGaugePreference}.