Merge "Stop using cameraProtectionAnimator field" into main (251131b5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt

+15 −4

Original line number	Diff line number	Diff line
		@@ -109,11 +109,20 @@ class FaceScanningOverlay(
		requestLayout()
		}

		if (!Flags.faceScanningAnimationNpeFix()) {
		cameraProtectionAnimator?.cancel()
		cameraProtectionAnimator = cameraProtectionAnimator(faceAuthSucceeded)
		}

		rimAnimator?.cancel()
		rimAnimator = faceScanningRimAnimator(faceAuthSucceeded, cameraProtectionAnimator)
		rimAnimator = faceScanningRimAnimator(
		faceAuthSucceeded,
		if (Flags.faceScanningAnimationNpeFix()) {
		cameraProtectionAnimator(faceAuthSucceeded)
		} else {
		cameraProtectionAnimator
		},
		)
		rimAnimator?.start()
		}

		@@ -160,7 +169,9 @@ class FaceScanningOverlay(
		addUpdateListener(this@FaceScanningOverlay::updateCameraProtectionProgress)
		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator) {
		if (!Flags.faceScanningAnimationNpeFix()) {
		cameraProtectionAnimator = null
		}
		if (!showScanningAnim) {
		hide()
		}