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

Merge "Turn in the work profile's badge." into oc-mr1-dev

Browse Source 
am: 6361c9d851

Change-Id: If1df9295530334cf58ffec9577b625fedad7ad4e
This commit is contained in:
Daniel Nishi
2017-09-07 17:44:00 +00:00
committed by android-build-merger
parent cad295918c 6361c9d851
commit 7ee2b191d6
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -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));
} }
} }