Merge "Tint the work icon." into oc-mr1-dev
am: 260ec8b9ea
Change-Id: I4315981fab4efde7197e1026f2a2ba140647252b
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index 684ac52..cf1e360 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
+import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.storage.VolumeInfo;
@@ -126,7 +127,14 @@
public void handleUserIcons(SparseArray<Drawable> fetchedIcons) {
Drawable userIcon = fetchedIcons.get(mUser.id);
if (userIcon != null) {
- mStoragePreference.setIcon(userIcon);
+ mStoragePreference.setIcon(applyTint(mContext, userIcon));
}
}
+
+ private static Drawable applyTint(Context context, Drawable icon) {
+ icon = icon.mutate();
+ icon.setTint(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
+ return icon;
+ }
+
}