diff options
| author | 2017-08-29 11:30:52 -0400 | |
|---|---|---|
| committer | 2017-08-29 11:30:52 -0400 | |
| commit | 826b6094a76efdfa747f477285bc7083bc80c73f (patch) | |
| tree | 50d82c31fff22dd5c3437621d370cfaf038fba3f | |
| parent | a59380177dbfa53614cff1c101f66a21fc9dc9f3 (diff) | |
| parent | 1a5e87918ebe4419653f3cb93c533af292b20bb7 (diff) | |
resolve merge conflicts of 1a5e87918ebe to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4d79b74e70e910db662713a2d5ffdcfe287b084f
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index 9eb29f8bfae8..3aa78676d755 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -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; @@ -404,8 +405,9 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, @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); |