Loading src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +9 −14 Original line number Original line Diff line number Diff line Loading @@ -208,23 +208,18 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle public void setUserId(UserHandle userHandle) { public void setUserId(UserHandle userHandle) { mUserId = userHandle.getIdentifier(); mUserId = userHandle.getIdentifier(); PackageManager pm = mContext.getPackageManager(); tintPreference(mPhotoPreference); badgePreference(pm, userHandle, mPhotoPreference); tintPreference(mMoviesPreference); badgePreference(pm, userHandle, mMoviesPreference); tintPreference(mAudioPreference); badgePreference(pm, userHandle, mAudioPreference); tintPreference(mGamePreference); badgePreference(pm, userHandle, mGamePreference); tintPreference(mAppPreference); badgePreference(pm, userHandle, mAppPreference); tintPreference(mSystemPreference); badgePreference(pm, userHandle, mSystemPreference); tintPreference(mFilePreference); badgePreference(pm, userHandle, mFilePreference); } } private void badgePreference(PackageManager pm, UserHandle userHandle, Preference preference) { private void tintPreference(Preference preference) { if (preference != null) { if (preference != null) { Drawable currentIcon = preference.getIcon(); preference.setIcon(applyTint(mContext, preference.getIcon())); // Sigh... Applying the badge to the icon clobbers the tint on the base drawable. // For some reason, reapplying it here means the tint remains. currentIcon = applyTint(mContext, currentIcon); preference.setIcon(pm.getUserBadgedIcon(currentIcon, userHandle)); } } } } Loading Loading
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +9 −14 Original line number Original line Diff line number Diff line Loading @@ -208,23 +208,18 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle public void setUserId(UserHandle userHandle) { public void setUserId(UserHandle userHandle) { mUserId = userHandle.getIdentifier(); mUserId = userHandle.getIdentifier(); PackageManager pm = mContext.getPackageManager(); tintPreference(mPhotoPreference); badgePreference(pm, userHandle, mPhotoPreference); tintPreference(mMoviesPreference); badgePreference(pm, userHandle, mMoviesPreference); tintPreference(mAudioPreference); badgePreference(pm, userHandle, mAudioPreference); tintPreference(mGamePreference); badgePreference(pm, userHandle, mGamePreference); tintPreference(mAppPreference); badgePreference(pm, userHandle, mAppPreference); tintPreference(mSystemPreference); badgePreference(pm, userHandle, mSystemPreference); tintPreference(mFilePreference); badgePreference(pm, userHandle, mFilePreference); } } private void badgePreference(PackageManager pm, UserHandle userHandle, Preference preference) { private void tintPreference(Preference preference) { if (preference != null) { if (preference != null) { Drawable currentIcon = preference.getIcon(); preference.setIcon(applyTint(mContext, preference.getIcon())); // Sigh... Applying the badge to the icon clobbers the tint on the base drawable. // For some reason, reapplying it here means the tint remains. currentIcon = applyTint(mContext, currentIcon); preference.setIcon(pm.getUserBadgedIcon(currentIcon, userHandle)); } } } } Loading