Merge "Add Face Scanning anim" into tm-d1-dev am: b7d919b789 am: 45ac7fb8fc (82691097) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/values/config.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@
		<!-- Will display the bouncer on one side of the display, and the current user icon and
		user switcher on the other side -->
		<bool name="config_enableBouncerUserSwitcher">false</bool>
		<!-- Whether to show the face scanning animation on devices with face auth supported.
		The face scanning animation renders in a SW layer in ScreenDecorations.
		Enabling this will also render the camera protection in the SW layer
		(instead of HW, if relevant)."=-->
		<bool name="config_enableFaceScanningAnimation">true</bool>
		<!-- Time to be considered a consecutive fingerprint failure in ms -->
		<integer name="fp_consecutive_failure_time_ms">3500</integer>
		</resources>

packages/SystemUI/res/values/ids.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -176,5 +176,8 @@
		<item type="id" name="rounded_corner_top_right"/>
		<item type="id" name="rounded_corner_bottom_left"/>
		<item type="id" name="rounded_corner_bottom_right"/>

		<!-- face scanning view id -->
		<item type="id" name="face_scanning_anim"/>
		</resources>

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -1040,7 +1040,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		private void handleFaceError(int msgId, String errString) {
		Assert.isMainThread();
		if (DEBUG_FACE) Log.d(TAG, "Face error received: " + errString);
		if (DEBUG_FACE) Log.d(TAG, "Face error received: " + errString + " msgId=" + msgId);
		if (mHandler.hasCallbacks(mFaceCancelNotReceived)) {
		mHandler.removeCallbacks(mFaceCancelNotReceived);
		}
		@@ -2183,6 +2183,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		&& mBiometricEnabledForUser.get(userId));
		}

		public boolean isFaceSupported() {
		return mFaceManager != null && mFaceManager.isHardwareDetected();
		}

		/**
		* @return true if there's at least one udfps enrolled for the current user.
		*/
		@@ -2309,6 +2313,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		stopListeningForFace();
		}

		public boolean isFaceScanning() {
		return mFaceRunningState == BIOMETRIC_STATE_RUNNING;
		}

		private void updateFaceListeningState(int action) {
		// If this message exists, we should not authenticate again until this message is
		// consumed by the handler

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ open class DisplayCutoutBaseView : View, RegionInterceptableView {
		}

		companion object {
		private const val HIDDEN_CAMERA_PROTECTION_SCALE = 0.5f
		const val HIDDEN_CAMERA_PROTECTION_SCALE = 0.5f

		@JvmStatic protected fun transformPhysicalToLogicalCoordinates(
		@Surface.Rotation rotation: Int,

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

0 → 100644

+260 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui

		import android.animation.Animator
		import android.animation.AnimatorListenerAdapter
		import android.animation.AnimatorSet
		import android.animation.ValueAnimator
		import android.content.Context
		import android.graphics.Canvas
		import android.graphics.Color
		import android.graphics.Matrix
		import android.graphics.Paint
		import android.graphics.Path
		import android.graphics.RectF
		import android.view.View
		import androidx.core.graphics.ColorUtils
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.settingslib.Utils
		import com.android.systemui.animation.Interpolators
		import com.android.systemui.plugins.statusbar.StatusBarStateController

		/**
		* When the face is enrolled, we use this view to show the face scanning animation and the camera
		* protection on the keyguard.
		*/
		class FaceScanningOverlay(
		context: Context,
		pos: Int,
		val statusBarStateController: StatusBarStateController,
		val keyguardUpdateMonitor: KeyguardUpdateMonitor
		) : ScreenDecorations.DisplayCutoutView(context, pos) {
		private var showScanningAnim = false
		private val rimPaint = Paint()
		private var rimProgress: Float = HIDDEN_CAMERA_PROTECTION_SCALE
		private var rimAnimator: AnimatorSet? = null
		private val rimRect = RectF()
		private var cameraProtectionColor = Color.BLACK
		var faceScanningAnimColor = Utils.getColorAttrDefaultColor(context,
		com.android.systemui.R.attr.wallpaperTextColorAccent)

		override fun setColor(color: Int) {
		cameraProtectionColor = color
		invalidate()
		}

		private var cameraProtectionAnimator: ValueAnimator? = null
		var hideOverlayRunnable: Runnable? = null

		override fun drawCutoutProtection(canvas: Canvas) {
		if (rimProgress > HIDDEN_RIM_SCALE && !protectionRect.isEmpty) {
		val rimPath = Path(protectionPath)
		val scaleMatrix = Matrix().apply {
		val rimBounds = RectF()
		rimPath.computeBounds(rimBounds, true)
		setScale(rimProgress, rimProgress, rimBounds.centerX(), rimBounds.centerY())
		}
		rimPath.transform(scaleMatrix)
		rimPaint.style = Paint.Style.FILL
		val rimPaintAlpha = rimPaint.alpha
		rimPaint.color = ColorUtils.blendARGB(
		faceScanningAnimColor,
		Color.WHITE,
		statusBarStateController.dozeAmount)
		rimPaint.alpha = rimPaintAlpha
		canvas.drawPath(rimPath, rimPaint)
		}

		if (cameraProtectionProgress > HIDDEN_CAMERA_PROTECTION_SCALE &&
		!protectionRect.isEmpty) {
		val scaledProtectionPath = Path(protectionPath)
		val scaleMatrix = Matrix().apply {
		val protectionPathRect = RectF()
		scaledProtectionPath.computeBounds(protectionPathRect, true)
		setScale(cameraProtectionProgress, cameraProtectionProgress,
		protectionPathRect.centerX(), protectionPathRect.centerY())
		}
		scaledProtectionPath.transform(scaleMatrix)
		paint.style = Paint.Style.FILL
		paint.color = cameraProtectionColor
		canvas.drawPath(scaledProtectionPath, paint)
		}
		}

		override fun enableShowProtection(show: Boolean) {
		val showScanningAnimNow = keyguardUpdateMonitor.isFaceScanning && show
		if (showScanningAnimNow == showScanningAnim) {
		return
		}

		showScanningAnim = showScanningAnimNow
		updateProtectionBoundingPath()
		// Delay the relayout until the end of the animation when hiding,
		// otherwise we'd clip it.
		if (showScanningAnim) {
		visibility = View.VISIBLE
		requestLayout()
		}

		cameraProtectionAnimator?.cancel()
		cameraProtectionAnimator = ValueAnimator.ofFloat(cameraProtectionProgress,
		if (showScanningAnimNow) 1.0f else HIDDEN_CAMERA_PROTECTION_SCALE).apply {
		startDelay = if (showScanningAnim) 0 else PULSE_DISAPPEAR_DURATION
		duration = if (showScanningAnim) PULSE_APPEAR_DURATION else
		CAMERA_PROTECTION_DISAPPEAR_DURATION
		interpolator = if (showScanningAnim) Interpolators.STANDARD else
		Interpolators.EMPHASIZED

		addUpdateListener(ValueAnimator.AnimatorUpdateListener {
		animation: ValueAnimator ->
		cameraProtectionProgress = animation.animatedValue as Float
		invalidate()
		})
		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator) {
		cameraProtectionAnimator = null
		if (!showScanningAnim) {
		visibility = View.INVISIBLE
		hideOverlayRunnable?.run()
		hideOverlayRunnable = null
		requestLayout()
		}
		}
		})
		start()
		}

		rimAnimator?.cancel()
		rimAnimator = AnimatorSet().apply {
		val rimAppearOrDisappearAnimator = ValueAnimator.ofFloat(rimProgress,
		if (showScanningAnim) PULSE_RADIUS_OUT else (PULSE_RADIUS_IN * 1.15f)).apply {
		duration = if (showScanningAnim) PULSE_APPEAR_DURATION else PULSE_DISAPPEAR_DURATION
		interpolator = Interpolators.STANDARD
		addUpdateListener(ValueAnimator.AnimatorUpdateListener {
		animation: ValueAnimator ->
		rimProgress = animation.animatedValue as Float
		invalidate()
		})
		}
		if (showScanningAnim) {
		// appear and then pulse in/out
		playSequentially(rimAppearOrDisappearAnimator,
		createPulseAnimator(), createPulseAnimator(),
		createPulseAnimator(), createPulseAnimator(),
		createPulseAnimator(), createPulseAnimator())
		} else {
		val opacityAnimator = ValueAnimator.ofInt(255, 0).apply {
		duration = PULSE_DISAPPEAR_DURATION
		interpolator = Interpolators.LINEAR
		addUpdateListener(ValueAnimator.AnimatorUpdateListener {
		animation: ValueAnimator ->
		rimPaint.alpha = animation.animatedValue as Int
		invalidate()
		})
		}
		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator) {
		rimProgress = HIDDEN_RIM_SCALE
		rimPaint.alpha = 255
		invalidate()
		}
		})

		// disappear
		playTogether(rimAppearOrDisappearAnimator, opacityAnimator)
		}

		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator) {
		rimAnimator = null
		if (!showScanningAnim) {
		requestLayout()
		}
		}
		})
		start()
		}
		}

		fun createPulseAnimator(): AnimatorSet {
		return AnimatorSet().apply {
		val pulseInwards = ValueAnimator.ofFloat(
		PULSE_RADIUS_OUT, PULSE_RADIUS_IN).apply {
		duration = PULSE_DURATION_INWARDS
		interpolator = Interpolators.STANDARD
		addUpdateListener(ValueAnimator.AnimatorUpdateListener {
		animation: ValueAnimator ->
		rimProgress = animation.animatedValue as Float
		invalidate()
		})
		}
		val pulseOutwards = ValueAnimator.ofFloat(
		PULSE_RADIUS_IN, PULSE_RADIUS_OUT).apply {
		duration = PULSE_DURATION_OUTWARDS
		interpolator = Interpolators.STANDARD
		addUpdateListener(ValueAnimator.AnimatorUpdateListener {
		animation: ValueAnimator ->
		rimProgress = animation.animatedValue as Float
		invalidate()
		})
		}
		playSequentially(pulseInwards, pulseOutwards)
		}
		}

		override fun updateProtectionBoundingPath() {
		super.updateProtectionBoundingPath()
		rimRect.set(protectionRect)
		rimRect.scale(rimProgress)
		}

		override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
		if (mBounds.isEmpty()) {
		super.onMeasure(widthMeasureSpec, heightMeasureSpec)
		return
		}
		if (showScanningAnim) {
		// Make sure that our measured height encompasses the extra space for the animation
		mTotalBounds.union(mBoundingRect)
		mTotalBounds.union(
		rimRect.left.toInt(),
		rimRect.top.toInt(),
		rimRect.right.toInt(),
		rimRect.bottom.toInt())
		setMeasuredDimension(
		resolveSizeAndState(mTotalBounds.width(), widthMeasureSpec, 0),
		resolveSizeAndState(mTotalBounds.height(), heightMeasureSpec, 0))
		} else {
		setMeasuredDimension(
		resolveSizeAndState(mBoundingRect.width(), widthMeasureSpec, 0),
		resolveSizeAndState(mBoundingRect.height(), heightMeasureSpec, 0))
		}
		}

		companion object {
		private const val HIDDEN_RIM_SCALE = HIDDEN_CAMERA_PROTECTION_SCALE

		private const val PULSE_APPEAR_DURATION = 350L
		private const val PULSE_DURATION_INWARDS = 500L
		private const val PULSE_DURATION_OUTWARDS = 500L
		private const val PULSE_DISAPPEAR_DURATION = 850L
		private const val CAMERA_PROTECTION_DISAPPEAR_DURATION = 700L // excluding start delay
		private const val PULSE_RADIUS_IN = 1.15f
		private const val PULSE_RADIUS_OUT = 1.25f
		}
		}