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

Merge "AOD lock icons should always be white" into sc-v2-dev am: da7af7d887

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16357918

Change-Id: I276226185d6f155fed59f50c13d4db7bcf778d63
This commit is contained in:
TreeHugger Robot
2021-11-29 18:35:26 +00:00
committed by Automerger Merge Worker
parent 273e99e039 da7af7d887
commit 24c27844ed
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/keyguard/LockIconView.java
View File

@@ -18,6 +18,7 @@ package com.android.keyguard;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.RectF; import android.graphics.RectF;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -30,6 +31,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.internal.graphics.ColorUtils;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.Dumpable; import com.android.systemui.Dumpable;
import com.android.systemui.R; import com.android.systemui.R;
@@ -82,14 +84,18 @@ public class LockIconView extends FrameLayout implements Dumpable {
void updateColorAndBackgroundVisibility() { void updateColorAndBackgroundVisibility() {
if (mUseBackground && mLockIcon.getDrawable() != null) { if (mUseBackground && mLockIcon.getDrawable() != null) {
mLockIconColor = Utils.getColorAttrDefaultColor(getContext(), mLockIconColor = ColorUtils.blendARGB(
android.R.attr.textColorPrimary); Utils.getColorAttrDefaultColor(getContext(), android.R.attr.textColorPrimary),
Color.WHITE,
mDozeAmount);
mBgView.setBackground(getContext().getDrawable(R.drawable.fingerprint_bg)); mBgView.setBackground(getContext().getDrawable(R.drawable.fingerprint_bg));
mBgView.setAlpha(1f - mDozeAmount); mBgView.setAlpha(1f - mDozeAmount);
mBgView.setVisibility(View.VISIBLE); mBgView.setVisibility(View.VISIBLE);
} else { } else {
mLockIconColor = Utils.getColorAttrDefaultColor(getContext(), mLockIconColor = ColorUtils.blendARGB(
R.attr.wallpaperTextColorAccent); Utils.getColorAttrDefaultColor(getContext(), R.attr.wallpaperTextColorAccent),
Color.WHITE,
mDozeAmount);
mBgView.setVisibility(View.GONE); mBgView.setVisibility(View.GONE);
} }