Merge "Retry auth during tap on lock screen." into qt-r1-dev am: f67706c43a

am: fd3e44fdc5

Change-Id: I18947413cae13937f886b7363d3a9d37281ece2b
This commit is contained in:
Robert Snoeberger
2019-06-24 10:38:40 -07:00
committed by android-build-merger

View File

@@ -56,6 +56,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.keyguard.KeyguardClockSwitch;
import com.android.keyguard.KeyguardStatusView;
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.systemui.DejankUtils;
import com.android.systemui.Dependency;
import com.android.systemui.Interpolators;
@@ -154,6 +155,7 @@ public class NotificationPanelView extends PanelView implements
private final NotificationWakeUpCoordinator mWakeUpCoordinator;
private final PulseExpansionHandler mPulseExpansionHandler;
private final KeyguardBypassController mKeyguardBypassController;
private final KeyguardUpdateMonitor mUpdateMonitor;
@VisibleForTesting
protected KeyguardAffordanceHelper mAffordanceHelper;
@@ -382,6 +384,7 @@ public class NotificationPanelView extends PanelView implements
});
mThemeResId = context.getThemeResId();
mKeyguardBypassController = bypassController;
mUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
dynamicPrivacyController.addListener(this);
mBottomAreaShadeAlphaAnimator = ValueAnimator.ofFloat(1f, 0);
@@ -2427,6 +2430,7 @@ public class NotificationPanelView extends PanelView implements
onUnlockHintFinished();
return;
}
mUpdateMonitor.requestFaceAuth();
super.startUnlockHintAnimation();
}