summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-06-14 06:00:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-06-14 06:00:31 +0000
commit159309fb8224a3fe794973df4a32cdf6b6f85693 (patch)
tree5a97bfdcc5d1417c0d43ba22fbfd2782d7576d0c
parentf0082ed1e1085db998bff185f3fabaf895cc6d41 (diff)
parentb8796f2d71f92fd596c12243f32687181adc6edd (diff)
Merge "Update udfps icon alpha after bouncer vis changes" into sc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
index 750d42c0a848..980bb12d390c 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
@@ -358,7 +358,10 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
mIsBouncerVisible = mKeyguardViewManager.bouncerIsOrWillBeShowing();
if (!mIsBouncerVisible) {
mInputBouncerHiddenAmount = 1f;
+ } else if (mKeyguardViewManager.isBouncerShowing()) {
+ mInputBouncerHiddenAmount = 0f;
}
+ updateAlpha();
updatePauseAuth();
}