Merge "Fix QS user icon in guest mode" am: 7d4e9b81b4

am: 526cd8923f

Change-Id: I91836c0d28cefbe5965586609d6eb521c8c2158a
This commit is contained in:
Jason Monk
2017-08-29 14:49:42 +00:00
committed by android-build-merger

View File

@@ -45,6 +45,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto;
import com.android.keyguard.KeyguardStatusView;
import com.android.settingslib.Utils;
import com.android.settingslib.drawable.UserIconDrawable;
import com.android.systemui.Dependency;
import com.android.systemui.FontSizeUtils;
import com.android.systemui.R;
@@ -428,8 +429,9 @@ public class QSFooter extends FrameLayout implements
@Override
public void onUserInfoChanged(String name, Drawable picture, String userAccount) {
if (picture != null &&
UserManager.get(mContext).isGuestUser(ActivityManager.getCurrentUser())) {
picture = picture.getConstantState().newDrawable().mutate();
UserManager.get(mContext).isGuestUser(ActivityManager.getCurrentUser()) &&
!(picture instanceof UserIconDrawable)) {
picture = picture.getConstantState().newDrawable(mContext.getResources()).mutate();
picture.setColorFilter(
Utils.getColorAttr(mContext, android.R.attr.colorForeground),
Mode.SRC_IN);