Don't animate weight to 0 on face unlock bypass

The transition happens so fast, you can barely see the weight
animation, so let's not animate it.

Test: manual
Fixes: 192352151
Change-Id: Ie7430d6ab3ab0675826005125f87db03886ddc48
This commit is contained in:
Beverly
2021-07-09 13:22:20 -04:00
parent 1d2cbb6f50
commit b90494d2a1

View File

@@ -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);