Merge "Do no play hint animation when retrying auth" into qt-r1-dev

This commit is contained in:
TreeHugger Robot
2019-06-25 19:36:31 +00:00
committed by Android (Google) Code Review

View File

@@ -2430,7 +2430,6 @@ public class NotificationPanelView extends PanelView implements
onUnlockHintFinished();
return;
}
mUpdateMonitor.requestFaceAuth();
super.startUnlockHintAnimation();
}
@@ -2651,10 +2650,14 @@ public class NotificationPanelView extends PanelView implements
switch (mBarState) {
case StatusBarState.KEYGUARD:
if (!mDozingOnDown) {
mLockscreenGestureLogger.write(
MetricsEvent.ACTION_LS_HINT,
0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */);
startUnlockHintAnimation();
if (mKeyguardBypassController.getBypassEnabled()) {
mUpdateMonitor.requestFaceAuth();
} else {
mLockscreenGestureLogger.write(
MetricsEvent.ACTION_LS_HINT,
0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */);
startUnlockHintAnimation();
}
}
return true;
case StatusBarState.SHADE_LOCKED: