Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 676c3734 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Bouncer is never showing in AOD" into tm-dev

parents 4ed3ca29 cb53fa88
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import android.annotation.NonNull;
import android.content.res.Configuration;
import android.util.Log;
import android.util.MathUtils;
import android.view.MotionEvent;

@@ -47,6 +48,7 @@ import java.io.PrintWriter;
 * Class that coordinates non-HBM animations during keyguard authentication.
 */
public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<UdfpsKeyguardView> {
    public static final String TAG = "UdfpsKeyguardViewCtrl";
    @NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;
    @NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
    @NonNull private final LockscreenShadeTransitionController mLockScreenShadeTransitionController;
@@ -246,7 +248,12 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
        }

        if (mInputBouncerHiddenAmount < .5f || mIsBouncerVisible) {
            if (!getStatusBarStateController().isDozing()) {
                return true;
            } else {
                Log.e(TAG, "Bouncer state claims visible on doze hiddenAmount="
                        + mInputBouncerHiddenAmount + " bouncerVisible=" + mIsBouncerVisible);
            }
        }

        return false;