Merge "Do no play hint animation when retrying auth" into qt-r1-dev am: dfba874730 (6c30e9c1) · Commits · e / os / android_frameworks_base

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

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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) {