diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml
index 93c2a1f306e..17fd4d51d77 100644
--- a/res-product/values/strings.xml
+++ b/res-product/values/strings.xml
@@ -551,10 +551,6 @@
Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery.
Limit battery for apps that you don\u2019t use often
-
- Tablet idle
-
- Phone idle
Battery Saver turns off when your phone charges above %1$s
diff --git a/res/drawable/ic_settings_phone_idle.xml b/res/drawable/ic_settings_phone_idle.xml
deleted file mode 100644
index fd304e775cd..00000000000
--- a/res/drawable/ic_settings_phone_idle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index e51db0873c3..308409e276c 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -146,15 +146,20 @@ public interface PowerUsageFeatureProvider {
Intent getResumeChargeIntent(boolean isDockDefender);
/**
- * Returns {@link Set} for hiding applications background usage time.
+ * Returns {@link Set} for hiding system component ids in the usage screen.
*/
- Set getHideBackgroundUsageTimeSet(Context context);
+ Set getHideSystemComponentSet(Context context);
/**
* Returns {@link Set} for hiding application package names in the usage screen.
*/
Set getHideApplicationSet(Context context);
+ /**
+ * Returns {@link Set} for hiding applications background usage time.
+ */
+ Set getHideBackgroundUsageTimeSet(Context context);
+
/**
* Returns {@link Set} for ignoring task root class names for screen on time.
*/
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index ba8587cc37c..5b33dc11a45 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -162,7 +162,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
}
@Override
- public Set getHideBackgroundUsageTimeSet(Context context) {
+ public Set getHideSystemComponentSet(Context context) {
return new ArraySet<>();
}
@@ -171,6 +171,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
return new ArraySet<>();
}
+ @Override
+ public Set getHideBackgroundUsageTimeSet(Context context) {
+ return new ArraySet<>();
+ }
+
@Override
public Set getIgnoreScreenOnTimeTaskRootSet(Context context) {
return new ArraySet<>();
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
index e9e034721a4..ba1ebaba860 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
@@ -590,11 +590,6 @@ public class BatteryEntry {
name = context.getResources().getString(R.string.power_wifi);
iconId = R.drawable.ic_settings_wireless_no_theme;
break;
- case BatteryConsumer.POWER_COMPONENT_IDLE:
- case BatteryConsumer.POWER_COMPONENT_MEMORY:
- name = context.getResources().getString(R.string.power_idle);
- iconId = R.drawable.ic_settings_phone_idle;
- break;
default:
Log.w(TAG, "unknown attribute:" + DebugUtils.constantToString(
BatteryConsumer.class, "POWER_COMPONENT_", powerComponentId));
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index c33e0a3ffb0..feea8f8300b 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -1224,6 +1224,10 @@ public final class DataProcessor {
private static void processBatteryDiffData(
final Context context,
final Map> resultMap) {
+ final Set hideSystemComponentSet =
+ FeatureFactory.getFactory(context)
+ .getPowerUsageFeatureProvider(context)
+ .getHideSystemComponentSet(context);
final Set hideBackgroundUsageTimeSet =
FeatureFactory.getFactory(context)
.getPowerUsageFeatureProvider(context)
@@ -1239,11 +1243,15 @@ public final class DataProcessor {
return;
}
purgeFakeAndHiddenPackages(
- batteryDiffData.getAppDiffEntryList(), hideBackgroundUsageTimeSet,
- hideApplicationSet);
+ batteryDiffData.getAppDiffEntryList(),
+ hideSystemComponentSet,
+ hideApplicationSet,
+ hideBackgroundUsageTimeSet);
purgeFakeAndHiddenPackages(
- batteryDiffData.getSystemDiffEntryList(), hideBackgroundUsageTimeSet,
- hideApplicationSet);
+ batteryDiffData.getSystemDiffEntryList(),
+ hideSystemComponentSet,
+ hideApplicationSet,
+ hideBackgroundUsageTimeSet);
batteryDiffData.setTotalConsumePower();
batteryDiffData.sortEntries();
});
@@ -1252,16 +1260,16 @@ public final class DataProcessor {
private static void purgeFakeAndHiddenPackages(
final List entries,
- final Set hideBackgroundUsageTimeSet,
- final Set hideApplicationSet) {
+ final Set hideSystemComponentSet,
+ final Set hideApplicationSet,
+ final Set hideBackgroundUsageTimeSet) {
final Iterator iterator = entries.iterator();
while (iterator.hasNext()) {
final BatteryDiffEntry entry = iterator.next();
final String packageName = entry.getPackageName();
- if (packageName == null) {
- continue;
- }
+ final Integer componentId = entry.mBatteryHistEntry.mDrainType;
if (ConvertUtils.FAKE_PACKAGE_NAME.equals(packageName)
+ || hideSystemComponentSet.contains(componentId)
|| hideApplicationSet.contains(packageName)) {
iterator.remove();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
index 463a66dbb41..7e5aaea68e1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
@@ -337,9 +337,6 @@ public class BatteryEntryTest {
assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_WIFI,
R.string.power_wifi,
R.drawable.ic_settings_wireless_no_theme);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_IDLE,
- R.string.power_idle,
- R.drawable.ic_settings_phone_idle);
}
private void assertNameAndIcon(String name, int stringId) {