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

Commit 83a0c627 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bouncer is never showing in AOD" into tm-dev am: 676c3734

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

Change-Id: I2d4c442908bd30ab800b09b92b76b39c95cfa2b2
parents b454c2e3 676c3734
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;