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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-25 19:36:31 +00:00
committed by Android (Google) Code Review
parent 370d19f213 6e383881ff
commit dfba874730
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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