From 1093f7c370adfb3ac05913fc22d66c79a6e48bbf Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 8 Jul 2021 13:46:03 -0400
Subject: [PATCH] Only hide udfps bouncer when transitioning TO doze

If we're transitioning OUT of doze, we should continue
to show the udfps bouncer. For example, this can happen if a user
taps on a notification in AOD2.

Test: manual
Fixes: 192416569
Change-Id: Ia5928022333ba860abdff841f0acc92af27a562f
---
 .../systemui/biometrics/UdfpsKeyguardViewController.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
index 819de538c8407..073e8861aa1e0 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
@@ -66,6 +66,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
     private boolean mHintShown;
     private int mStatusBarState;
     private float mTransitionToFullShadeProgress;
+    private float mLastDozeAmount;
 
     /**
      * hidden amount of pin/pattern/password bouncer
@@ -108,6 +109,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
         updateFaceDetectRunning(mKeyguardUpdateMonitor.isFaceDetectionRunning());
 
         final float dozeAmount = mStatusBarStateController.getDozeAmount();
+        mLastDozeAmount = dozeAmount;
         mStateListener.onDozeAmountChanged(dozeAmount, dozeAmount);
         mStatusBarStateController.addCallback(mStateListener);
 
@@ -287,8 +289,11 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
             new StatusBarStateController.StateListener() {
         @Override
         public void onDozeAmountChanged(float linear, float eased) {
-            if (linear != 0) showUdfpsBouncer(false);
+            if (mLastDozeAmount < linear) {
+                showUdfpsBouncer(false);
+            }
             mView.onDozeAmountChanged(linear, eased);
+            mLastDozeAmount = linear;
             updatePauseAuth();
         }