Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix QS user icon in guest mode"

Browse Source 
am: 7d4e9b81b4

Change-Id: I144ab6fea2e9ece6f01004c03c85da72a8c069f2
This commit is contained in:
Jason Monk
2017-08-29 14:40:47 +00:00
committed by android-build-merger
parent 0fc0cc9dd8 7d4e9b81b4
commit 526cd8923f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
View File

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