diff options
author | Beverly Tai <beverlyt@google.com> | 2021-07-15 20:38:46 +0000 |
---|---|---|
committer | Beverly Tai <beverlyt@google.com> | 2021-07-15 21:56:39 +0000 |
commit | 266e0b864fd2a4c6fdd65f3b361c7a9df5f9367b (patch) | |
tree | 8939ae37760b4f8257aaac85b95877cdea30f015 /packages/SystemUI/src/com/android/keyguard/LockIconViewController.java | |
parent | 09923d5eca02486324b55c9f28562d17418fc577 (diff) |
Revert "Animate in a background for kg unlock icon"
This reverts commit 09923d5eca02486324b55c9f28562d17418fc577.
Reason for revert: doesn't look good on smaller devices, punting to qpr
Bug: 192403524
Change-Id: I3e6bde6cf2f8cbbeb3502444cd63f2933704d357
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/LockIconViewController.java')
-rw-r--r-- | packages/SystemUI/src/com/android/keyguard/LockIconViewController.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index a7bd4c8e3d27..afea27222fbb 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -40,6 +40,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import com.android.settingslib.Utils; import com.android.systemui.Dumpable; import com.android.systemui.R; import com.android.systemui.biometrics.AuthController; @@ -144,7 +145,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme mUnlockedLabel = context.getResources().getString(R.string.accessibility_unlock_button); mLockedLabel = context.getResources().getString(R.string.accessibility_lock_icon); dumpManager.registerDumpable("LockIconViewController", this); - } @Override @@ -224,7 +224,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme mView.setImageDrawable(mLockIcon); mView.setVisibility(View.VISIBLE); mView.setContentDescription(mLockedLabel); - mView.hideBg(); } else if (mShowUnlockIcon) { if (wasShowingFpIcon) { mView.setImageDrawable(mFpToUnlockIcon); @@ -235,11 +234,9 @@ public class LockIconViewController extends ViewController<LockIconView> impleme mLockToUnlockIcon.forceAnimationOnUI(); mLockToUnlockIcon.start(); } - mView.animateBg(); mView.setVisibility(View.VISIBLE); mView.setContentDescription(mUnlockedLabel); } else { - mView.hideBg(); mView.setVisibility(View.INVISIBLE); mView.setContentDescription(null); } @@ -284,7 +281,11 @@ public class LockIconViewController extends ViewController<LockIconView> impleme } private void updateColors() { - mView.updateColor(); + final int color = Utils.getColorAttrDefaultColor(mView.getContext(), + R.attr.wallpaperTextColorAccent); + mFpToUnlockIcon.setTint(color); + mLockToUnlockIcon.setTint(color); + mLockIcon.setTint(color); } private void updateConfiguration() { @@ -444,7 +445,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme @Override public void onConfigChanged(Configuration newConfig) { updateConfiguration(); - updateColors(); } }; |