summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/fuelgauge
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-07-27 18:36:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-27 18:36:10 +0000
commit3b521b60d3a1921b5231633105d1ca7afadd9978 (patch)
tree78243eaae9c2eb80642a7b185d2b1ff14fd2df7f /src/com/android/settings/fuelgauge
parent08cb39837f02f37b854e7a4598d6f48d41d1ce94 (diff)
parent5ef0a9e826aaa8405a26f53c756f9bf0549709c3 (diff)
downloadpackages_apps_Settings-3b521b60d3a1921b5231633105d1ca7afadd9978.zip
packages_apps_Settings-3b521b60d3a1921b5231633105d1ca7afadd9978.tar.gz
packages_apps_Settings-3b521b60d3a1921b5231633105d1ca7afadd9978.tar.bz2
Merge "Battery summary - tint uid 0 icon" into mnc-dev
Diffstat (limited to 'src/com/android/settings/fuelgauge')
-rw-r--r--src/com/android/settings/fuelgauge/PowerUsageSummary.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 9e3029d..a1fcb52 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -317,7 +317,8 @@ public class PowerUsageSummary extends PowerUsageBase {
if (sipper.uidObj != null) {
pref.setKey(Integer.toString(sipper.uidObj.getUid()));
}
- if (sipper.drainType != DrainType.APP && sipper.drainType != DrainType.USER) {
+ if ((sipper.drainType != DrainType.APP || sipper.uidObj.getUid() == 0)
+ && sipper.drainType != DrainType.USER) {
pref.setTint(colorControl);
}
addedSome = true;