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

Commit 83f836fc authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Added fade animation to udfps#enroll#error" into tm-dev am: b9159d77 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17545058



Change-Id: I51499da1b43e5db918d3b4e9a80c8abf54657977
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3788344c b9159d77

packages/SystemUI/res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -137,9 +137,11 @@ 
    <!-- UDFPS colors -->

    <color name="udfps_enroll_icon">#7DA7F1</color>

    <color name="udfps_moving_target_fill">#475670</color>

    <!-- 50% of udfps_moving_target_fill-->

    <color name="udfps_moving_target_fill_error">#80475670</color>

    <color name="udfps_enroll_progress">#7DA7F1</color>

    <color name="udfps_enroll_progress_help">#607DA7F1</color>

    <color name="udfps_enroll_progress_help_with_talkback">#ffEE675C</color>

    <color name="udfps_enroll_progress_help_with_talkback">#FFEE675C</color>



    <!-- Floating overlay actions -->

    <color name="overlay_button_ripple">#1f000000</color>

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarDrawable.java

+36 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.ColorFilter; 
import android.graphics.Paint;

import android.graphics.drawable.Drawable;

import android.view.accessibility.AccessibilityManager;

import android.view.animation.DecelerateInterpolator;

import android.view.animation.Interpolator;

import android.view.animation.OvershootInterpolator;
@@ -40,13 +41,15 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 


    private static final long CHECKMARK_ANIMATION_DELAY_MS = 200L;

    private static final long CHECKMARK_ANIMATION_DURATION_MS = 300L;

    private static final long FILL_COLOR_ANIMATION_DURATION_MS = 200L;

    private static final long FILL_COLOR_ANIMATION_DURATION_MS = 350L;

    private static final long PROGRESS_ANIMATION_DURATION_MS = 400L;

    private static final float STROKE_WIDTH_DP = 12f;

    private static final Interpolator DEACCEL = new DecelerateInterpolator();



    private final float mStrokeWidthPx;

    @ColorInt private final int mProgressColor;

    @ColorInt private final int mHelpColor;

    @ColorInt private final int mOnFirstBucketFailedColor;

    @NonNull private final Drawable mCheckmarkDrawable;

    @NonNull private final Interpolator mCheckmarkInterpolator;

    @NonNull private final Paint mBackgroundPaint;
@@ -64,6 +67,9 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
    @Nullable private ValueAnimator mFillColorAnimator;

    @NonNull private final ValueAnimator.AnimatorUpdateListener mFillColorUpdateListener;



    @Nullable private ValueAnimator mBackgroundColorAnimator;

    @NonNull private final ValueAnimator.AnimatorUpdateListener mBackgroundColorUpdateListener;



    private boolean mComplete = false;

    private float mCheckmarkScale = 0f;

    @Nullable private ValueAnimator mCheckmarkAnimator;
@@ -76,8 +82,10 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
        final boolean isAccessbilityEnabled = am.isTouchExplorationEnabled();

        if (!isAccessbilityEnabled) {

            mHelpColor = context.getColor(R.color.udfps_enroll_progress_help);

            mOnFirstBucketFailedColor = context.getColor(R.color.udfps_moving_target_fill_error);

        } else {

            mHelpColor = context.getColor(R.color.udfps_enroll_progress_help_with_talkback);

            mOnFirstBucketFailedColor = mHelpColor;

        }

        mCheckmarkDrawable = context.getDrawable(R.drawable.udfps_enroll_checkmark);

        mCheckmarkDrawable.mutate();
@@ -112,6 +120,11 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
            mCheckmarkScale = (float) animation.getAnimatedValue();

            invalidateSelf();

        };



        mBackgroundColorUpdateListener = animation -> {

            mBackgroundPaint.setColor((int) animation.getAnimatedValue());

            invalidateSelf();

        };

    }



    void onEnrollmentProgress(int remaining, int totalSteps) {
@@ -163,19 +176,38 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
        }

    }



    private void animateBackgroundColor() {

        if (mBackgroundColorAnimator != null && mBackgroundColorAnimator.isRunning()) {

            mBackgroundColorAnimator.end();

        }

        mBackgroundColorAnimator = ValueAnimator.ofArgb(mBackgroundPaint.getColor(),

                mOnFirstBucketFailedColor);

        mBackgroundColorAnimator.setDuration(FILL_COLOR_ANIMATION_DURATION_MS);

        mBackgroundColorAnimator.setRepeatCount(1);

        mBackgroundColorAnimator.setRepeatMode(ValueAnimator.REVERSE);

        mBackgroundColorAnimator.setInterpolator(DEACCEL);

        mBackgroundColorAnimator.addUpdateListener(mBackgroundColorUpdateListener);

        mBackgroundColorAnimator.start();

    }



    private void updateFillColor(boolean showingHelp) {

        if (mShowingHelp == showingHelp) {

        if (!mAfterFirstTouch && showingHelp) {

            // If we are on the first touch, animate the background color

            // instead of the progress color.

            animateBackgroundColor();

            return;

        }

        mShowingHelp = showingHelp;



        if (mFillColorAnimator != null && mFillColorAnimator.isRunning()) {

            mFillColorAnimator.cancel();

            mFillColorAnimator.end();

        }



        @ColorInt final int targetColor = showingHelp ? mHelpColor : mProgressColor;

        mFillColorAnimator = ValueAnimator.ofArgb(mFillPaint.getColor(), targetColor);

        mFillColorAnimator.setDuration(FILL_COLOR_ANIMATION_DURATION_MS);

        mFillColorAnimator.setRepeatCount(1);

        mFillColorAnimator.setRepeatMode(ValueAnimator.REVERSE);

        mFillColorAnimator.setInterpolator(DEACCEL);

        mFillColorAnimator.addUpdateListener(mFillColorUpdateListener);

        mFillColorAnimator.start();

    }