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

Add type UNACCOUNTED("miscellaneous") in advanced battery page

Browse Source 
This type is equal to DrainType.UNACCOUNTED.

Bug: 35926913
Test: RunSettingsRoboTests
Change-Id: I2be73a5220c6d674593508f2578e7c4f6e111ea9
This commit is contained in:
jackqdyulei
2017-03-02 15:05:47 -08:00
parent 05c3333cbd
commit 64af489a6a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
UsageType.BLUETOOTH, UsageType.BLUETOOTH,
UsageType.USER, UsageType.USER,
UsageType.IDLE, UsageType.IDLE,
UsageType.APP}; UsageType.APP,
UsageType.UNACCOUNTED};
private BatteryHistoryPreference mHistPref; private BatteryHistoryPreference mHistPref;
private PreferenceGroup mUsageListGroup; private PreferenceGroup mUsageListGroup;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider; private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
@@ -114,7 +115,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
mUsageListGroup.removeAll(); mUsageListGroup.removeAll();
for (int i = 0, size = dataList.size(); i < size; i++) { for (int i = 0, size = dataList.size(); i < size; i++) {
final PowerUsageData batteryData = dataList.get(i); final PowerUsageData batteryData = dataList.get(i);
final PowerGaugePreference pref = new PowerGaugePreference(getContext()); final PowerGaugePreference pref = new PowerGaugePreference(getPrefContext());
pref.setTitle(batteryData.titleResId); pref.setTitle(batteryData.titleResId);
pref.setSummary(batteryData.summary); pref.setSummary(batteryData.summary);
@@ -139,6 +140,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
return UsageType.USER; return UsageType.USER;
} else if (drainType == DrainType.CELL) { } else if (drainType == DrainType.CELL) {
return UsageType.CELL; return UsageType.CELL;
} else if (drainType == DrainType.UNACCOUNTED) {
return UsageType.UNACCOUNTED;
} else if (mPowerUsageFeatureProvider.isTypeSystem(sipper)) { } else if (mPowerUsageFeatureProvider.isTypeSystem(sipper)) {
return UsageType.SYSTEM; return UsageType.SYSTEM;
} else if (mPowerUsageFeatureProvider.isTypeService(sipper)) { } else if (mPowerUsageFeatureProvider.isTypeService(sipper)) {
@@ -200,7 +203,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
UsageType.SYSTEM, UsageType.SYSTEM,
UsageType.BLUETOOTH, UsageType.BLUETOOTH,
UsageType.USER, UsageType.USER,
UsageType.IDLE}) UsageType.IDLE,
UsageType.UNACCOUNTED})
public @interface UsageType { public @interface UsageType {
int APP = 0; int APP = 0;
int WIFI = 1; int WIFI = 1;
@@ -210,6 +214,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
int BLUETOOTH = 5; int BLUETOOTH = 5;
int USER = 6; int USER = 6;
int IDLE = 7; int IDLE = 7;
int UNACCOUNTED = 8;
} }
@StringRes @StringRes
@@ -249,6 +254,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
return R.string.power_user; return R.string.power_user;
case UsageType.IDLE: case UsageType.IDLE:
return R.string.power_idle; return R.string.power_idle;
case UsageType.UNACCOUNTED:
return R.string.power_unaccounted;
case UsageType.APP: case UsageType.APP:
default: default:
return R.string.power_apps; return R.string.power_apps;

6
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
View File

@@ -94,9 +94,9 @@ public class PowerUsageAdvancedTest {
@Test @Test
public void testExtractUsageType_TypeEqualsToDrainType_ReturnRelevantType() { public void testExtractUsageType_TypeEqualsToDrainType_ReturnRelevantType() {
final DrainType drainTypes[] = {DrainType.WIFI, DrainType.BLUETOOTH, DrainType.IDLE, final DrainType drainTypes[] = {DrainType.WIFI, DrainType.BLUETOOTH, DrainType.IDLE,
DrainType.USER, DrainType.CELL}; DrainType.USER, DrainType.CELL, DrainType.UNACCOUNTED};
final int usageTypes[] = {UsageType.WIFI, UsageType.BLUETOOTH, UsageType.IDLE, final int usageTypes[] = {UsageType.WIFI, UsageType.BLUETOOTH, UsageType.IDLE,
UsageType.USER, UsageType.CELL}; UsageType.USER, UsageType.CELL, UsageType.UNACCOUNTED};
assertThat(drainTypes.length).isEqualTo(usageTypes.length); assertThat(drainTypes.length).isEqualTo(usageTypes.length);
for (int i = 0, size = drainTypes.length; i < size; i++) { for (int i = 0, size = drainTypes.length; i < size; i++) {
@@ -147,7 +147,7 @@ public class PowerUsageAdvancedTest {
assertThat(usageTypeSet).asList().containsExactly(UsageType.APP, UsageType.WIFI, assertThat(usageTypeSet).asList().containsExactly(UsageType.APP, UsageType.WIFI,
UsageType.CELL, UsageType.BLUETOOTH, UsageType.IDLE, UsageType.SERVICE, UsageType.CELL, UsageType.BLUETOOTH, UsageType.IDLE, UsageType.SERVICE,
UsageType.USER, UsageType.SYSTEM); UsageType.USER, UsageType.SYSTEM, UsageType.UNACCOUNTED);
} }
@Test @Test