summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2014-07-29 10:24:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:35:58 +0000
commit0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed (patch)
tree68191503aecf4af8565b47a34b1883686c747682
parent74f34e496fc460842aa558512de03187f5ad9b2c (diff)
parent08c2f36c3a8a32cbe052848f15b28accfb9b5049 (diff)
downloadpackages_apps_Settings-0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed.tar.gz
packages_apps_Settings-0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed.tar.bz2
packages_apps_Settings-0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed.zip
Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
-rw-r--r--src/com/android/settings/fuelgauge/PowerUsageSummary.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index a691d4d57..3ce2ac013 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -332,7 +332,9 @@ public class PowerUsageSummary extends PreferenceFragment {
(PowerGaugePreference) findPreference(
Integer.toString(entry.sipper.uidObj.getUid()));
if (pgp != null) {
- pgp.setIcon(entry.icon);
+ final int userId = UserHandle.getUserId(entry.sipper.getUid());
+ final UserHandle userHandle = new UserHandle(userId);
+ pgp.setIcon(mUm.getBadgedDrawableForUser(entry.getIcon(), userHandle));
pgp.setTitle(entry.name);
}
break;