Merge "Don't animate weight to 0 on face unlock bypass" into sc-dev

packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java

@@ -21,7 +21,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Color;
-import android.hardware.biometrics.BiometricSourceType;
 import android.icu.text.NumberFormat;
 
 import com.android.settingslib.Utils;
@@ -94,9 +93,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
         @Override
         public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {
             if (mKeyguardShowing && !mIsCharging && charging) {
-                mView.animateCharge(() -> {
-                    return mStatusBarStateController.isDozing();
-                });
+                mView.animateCharge(mStatusBarStateController::isDozing);
             }
             mIsCharging = charging;
         }
@@ -126,22 +123,11 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
 
     private final KeyguardUpdateMonitorCallback mKeyguardUpdateMonitorCallback =
             new KeyguardUpdateMonitorCallback() {
-        @Override
-        public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType,
-                boolean isStrongBiometric) {
-            // Strong auth will force the bouncer regardless of a successful face auth
-            if (biometricSourceType == BiometricSourceType.FACE
-                    && mBypassController.canBypass()
-                    && !mKeyguardUpdateMonitor.userNeedsStrongAuth()) {
-                mView.animateDisappear();
-            }
-        }
-
         @Override
         public void onKeyguardVisibilityChanged(boolean showing) {
             mKeyguardShowing = showing;
             if (!mKeyguardShowing) {
-                // reset state (ie: after animateDisappear)
+                // reset state (ie: after weight animations)
                 reset();
             }
         }
@@ -156,7 +142,6 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
         mDozeAmount = mStatusBarStateController.getDozeAmount();
         mBatteryController.addCallback(mBatteryCallback);
         mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback);
-        mKeyguardShowing = true;
 
         mStatusBarStateController.removeCallback(mStatusBarStatePersistentListener);
         mStatusBarStateController.addCallback(mStatusBarStatePersistentListener);