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

Commit 7899241e authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Slight updates to UDFPS enroll affordances" into sc-dev am: 0422207d 

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

Change-Id: If1de1979d6084caadbf4e1851aab6954af90ec84
parents ad178b74 0422207d

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

+12 −16
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.biometrics;

package com.android.systemui.biometrics;





import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Color;

import android.graphics.Paint;

import android.graphics.Paint;
@@ -37,11 +36,10 @@ import com.android.systemui.R; 
public class UdfpsEnrollDrawable extends UdfpsDrawable {

public class UdfpsEnrollDrawable extends UdfpsDrawable {

    private static final String TAG = "UdfpsAnimationEnroll";

    private static final String TAG = "UdfpsAnimationEnroll";





    private static final float SHADOW_RADIUS = 5.f;

    static final float PROGRESS_BAR_RADIUS = 180.f;

    static final float PROGRESS_BAR_RADIUS = 140.f;





    @NonNull private final Drawable mMovingTargetFpIcon;

    @NonNull private final Drawable mMovingTargetFpIcon;

    @NonNull private final Paint mSensorPaint;

    @NonNull private final Paint mSensorOutlinePaint;

    @NonNull private final Paint mBlueFill;

    @NonNull private final Paint mBlueFill;

    @NonNull private final Paint mBlueStroke;

    @NonNull private final Paint mBlueStroke;
@@ -51,11 +49,11 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { 
    UdfpsEnrollDrawable(@NonNull Context context) {

    UdfpsEnrollDrawable(@NonNull Context context) {

        super(context);

        super(context);





        mSensorPaint = new Paint(0 /* flags */);

        mSensorOutlinePaint = new Paint(0 /* flags */);

        mSensorPaint.setAntiAlias(true);

        mSensorOutlinePaint.setAntiAlias(true);

        mSensorPaint.setColor(Color.WHITE);

        mSensorOutlinePaint.setColor(mContext.getColor(R.color.udfps_enroll_icon));

        mSensorPaint.setShadowLayer(SHADOW_RADIUS, 0, 0, Color.BLACK);

        mSensorOutlinePaint.setStyle(Paint.Style.STROKE);

        mSensorPaint.setStyle(Paint.Style.FILL);

        mSensorOutlinePaint.setStrokeWidth(2.f);





        mBlueFill = new Paint(0 /* flags */);

        mBlueFill = new Paint(0 /* flags */);

        mBlueFill.setAntiAlias(true);

        mBlueFill.setAntiAlias(true);
@@ -98,18 +96,15 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { 
            return;

            return;

        }

        }





        final boolean isNightMode = (mContext.getResources().getConfiguration().uiMode

                & Configuration.UI_MODE_NIGHT_YES) != 0;

        if (!isNightMode) {

        if (mSensorRect != null) {

        if (mSensorRect != null) {

                canvas.drawOval(mSensorRect, mSensorPaint);

            canvas.drawOval(mSensorRect, mSensorOutlinePaint);

            }

        }

        }

        mFingerprintDrawable.draw(canvas);

        mFingerprintDrawable.draw(canvas);





        // Draw moving target

        // Draw moving target

        if (mEnrollHelper.isCenterEnrollmentComplete()) {

        if (mEnrollHelper.isCenterEnrollmentComplete()) {

            mFingerprintDrawable.setAlpha(mAlpha == 255 ? 64 : mAlpha);

            mFingerprintDrawable.setAlpha(mAlpha == 255 ? 64 : mAlpha);

            mSensorOutlinePaint.setAlpha(mAlpha == 255 ? 64 : mAlpha);





            canvas.save();

            canvas.save();

            final PointF point = mEnrollHelper.getNextGuidedEnrollmentPoint();

            final PointF point = mEnrollHelper.getNextGuidedEnrollmentPoint();
@@ -123,13 +118,14 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { 
            canvas.restore();

            canvas.restore();

        } else {

        } else {

            mFingerprintDrawable.setAlpha(mAlpha);

            mFingerprintDrawable.setAlpha(mAlpha);

            mSensorOutlinePaint.setAlpha(mAlpha);

        }

        }

    }

    }





    @Override

    @Override

    public void setAlpha(int alpha) {

    public void setAlpha(int alpha) {

        super.setAlpha(alpha);

        super.setAlpha(alpha);

        mSensorPaint.setAlpha(alpha);

        mSensorOutlinePaint.setAlpha(alpha);

        mBlueFill.setAlpha(alpha);

        mBlueFill.setAlpha(alpha);

        mBlueStroke.setAlpha(alpha);

        mBlueStroke.setAlpha(alpha);

        invalidateSelf();

        invalidateSelf();