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

Fix the icon flash issue cause from the shared drawable icon am: a3b89868f4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15802168

Change-Id: I4b3e87e071a2fec6ace88afe1336be08e77c4075
This commit is contained in:
ykhung
2021-09-11 00:13:28 +00:00
committed by Automerger Merge Worker
parent 05727f206b a3b89868f4
commit e44128f021
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fuelgauge/BatteryDiffEntry.java
View File

@@ -113,7 +113,7 @@ public class BatteryDiffEntry {
/** Gets the app icon {@link Drawable} for this entry. */
public Drawable getAppIcon() {
loadLabelAndIcon();
return mAppIcon;
return mAppIcon.getConstantState().newDrawable();
}
/** Gets the app icon id for this entry. */
@@ -348,8 +348,8 @@ public class BatteryDiffEntry {
private Drawable getBadgeIconForUser(Drawable icon) {
final int userId = UserHandle.getUserId((int) mBatteryHistEntry.mUid);
final UserHandle userHandle = new UserHandle(userId);
return mUserManager.getBadgedIconForUser(icon, userHandle);
return userId == UserHandle.USER_OWNER ? icon :
mUserManager.getBadgedIconForUser(icon, new UserHandle(userId));
}
private static boolean isSystemUid(int uid) {