commit 53b438771963444d4c6e97578755655d9b226782
author Zoltan Szatmary-Ban <szatmz@google.com> Fri Dec 19 10:24:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 19 10:24:01 2014 +0000
tree b0d1cf335f2eb9aba0229f36a59d9a0da3a6adb0
parent 2c875e4537a87dae67f7c523b4d62348ce3565c9
parent 903fa3f8ebabc4dd8c1841c54c65418937f052c8

Merge "Badge items in Settings > Apps > Running correctly"

src/com/android/settings/applications/RunningState.java

diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 4b58729..0b225b6 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -327,7 +327,9 @@
 
         public Drawable loadIcon(Context context, RunningState state) {
             if (mPackageInfo != null) {
-                return mPackageInfo.loadIcon(state.mPm);
+                Drawable unbadgedIcon = mPackageInfo.loadUnbadgedIcon(state.mPm);
+                Drawable icon = state.mPm.getUserBadgedIcon(unbadgedIcon, new UserHandle(mUserId));
+                return icon;
             }
             return null;
         }