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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-24 16:35:42 +00:00
committed by Android (Google) Code Review
parent a0f26da016 f4976b31f4
commit f67706c43a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

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