Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c85bb93 authored by Chandru's avatar Chandru Committed by Chandru S
Browse files

Refactor deeply nested rim animator into three cases for scanning, success, not successful 

Bug: 254814998
Test: verified manually, face scanning rim pulses 6 times, face scanning rim success animation identical, face scanning failure/not success animation identical to build without change.
Change-Id: Iefd7e8e82c2eebb5f50ace7ab66931a43258e8ac
parent 08241b1e

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

+80 −49
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui 
import android.animation.Animator

import android.animation.AnimatorListenerAdapter

import android.animation.AnimatorSet

import android.animation.TimeInterpolator

import android.animation.ValueAnimator

import android.content.Context

import android.graphics.Canvas
@@ -163,26 +164,62 @@ class FaceScanningOverlay( 
        }



        rimAnimator?.cancel()

        rimAnimator = AnimatorSet().apply {

            if (showScanningAnim) {

                // animate in camera protection, rim, and then pulse in/out

                playSequentially(

        rimAnimator = if (showScanningAnim) {

            createFaceScanningRimAnimator()

        } else if (faceAuthSucceeded) {

            createFaceSuccessRimAnimator()

        } else {

            createFaceNotSuccessRimAnimator()

        }

        rimAnimator?.apply {

            addListener(object : AnimatorListenerAdapter() {

                override fun onAnimationEnd(animation: Animator) {

                    rimAnimator = null

                    if (!showScanningAnim) {

                        requestLayout()

                    }

                }

            })

        }

        rimAnimator?.start()

    }



    private fun createFaceSuccessRimAnimator(): AnimatorSet {

        val rimSuccessAnimator = AnimatorSet()

        rimSuccessAnimator.playTogether(

            createRimDisappearAnimator(

                PULSE_RADIUS_SUCCESS,

                PULSE_SUCCESS_DISAPPEAR_DURATION,

                Interpolators.STANDARD_DECELERATE

            ),

            createSuccessOpacityAnimator(),

        )

        return AnimatorSet().apply {

            playTogether(rimSuccessAnimator, cameraProtectionAnimator)

        }

    }



    private fun createFaceNotSuccessRimAnimator(): AnimatorSet {

        return AnimatorSet().apply {

            playTogether(

                createRimDisappearAnimator(

                    SHOW_CAMERA_PROTECTION_SCALE,

                    PULSE_ERROR_DISAPPEAR_DURATION,

                    Interpolators.STANDARD

                ),

                cameraProtectionAnimator,

                    createRimAppearAnimator(),

                    createPulseAnimator()

            )

            } else {

                val rimDisappearAnimator = ValueAnimator.ofFloat(

                        rimProgress,

                        if (faceAuthSucceeded) PULSE_RADIUS_SUCCESS

                        else SHOW_CAMERA_PROTECTION_SCALE

                ).apply {

                    duration =

                            if (faceAuthSucceeded) PULSE_SUCCESS_DISAPPEAR_DURATION

                            else PULSE_ERROR_DISAPPEAR_DURATION

                    interpolator =

                            if (faceAuthSucceeded) Interpolators.STANDARD_DECELERATE

                            else Interpolators.STANDARD

        }

    }



    private fun createRimDisappearAnimator(

        endValue: Float,

        animDuration: Long,

        timeInterpolator: TimeInterpolator

    ): ValueAnimator {

        return ValueAnimator.ofFloat(rimProgress, endValue).apply {

            duration = animDuration

            interpolator = timeInterpolator

            addUpdateListener(this@FaceScanningOverlay::updateRimProgress)

            addListener(object : AnimatorListenerAdapter() {

                override fun onAnimationEnd(animation: Animator) {
@@ -191,8 +228,10 @@ class FaceScanningOverlay( 
                }

            })

        }

                if (faceAuthSucceeded) {

                    val successOpacityAnimator = ValueAnimator.ofInt(255, 0).apply {

    }



    private fun createSuccessOpacityAnimator(): ValueAnimator {

        return ValueAnimator.ofInt(255, 0).apply {

            duration = PULSE_SUCCESS_DISAPPEAR_DURATION

            interpolator = Interpolators.LINEAR

            addUpdateListener(this@FaceScanningOverlay::updateRimAlpha)
@@ -203,23 +242,15 @@ class FaceScanningOverlay( 
                }

            })

        }

                    val rimSuccessAnimator = AnimatorSet()

                    rimSuccessAnimator.playTogether(rimDisappearAnimator, successOpacityAnimator)

                    playTogether(rimSuccessAnimator, cameraProtectionAnimator)

                } else {

                    playTogether(rimDisappearAnimator, cameraProtectionAnimator)

                }

    }



            addListener(object : AnimatorListenerAdapter() {

                override fun onAnimationEnd(animation: Animator) {

                    rimAnimator = null

                    if (!showScanningAnim) {

                        requestLayout()

                    }

                }

            })

            start()

    private fun createFaceScanningRimAnimator(): AnimatorSet {

        return AnimatorSet().apply {

            playSequentially(

                cameraProtectionAnimator,

                createRimAppearAnimator(),

                createPulseAnimator()

            )

        }

    }