Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Beverly Tai
2021-07-12 12:37:17 +00:00
committed by Android (Google) Code Review
parent 7a900474fb b90494d2a1
commit 01feaca6e2
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
View File

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