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

Commit 8404904b authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes I2339e806,Ic7eaddc4 into sc-dev 

* changes:
  Do not show fingerprint icon/circle underneath moving target
  Enlarge UDFPS enrollment progress bar
parents 28b091c6 89744e11

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

+5 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.R; 
public class UdfpsEnrollDrawable extends UdfpsDrawable {

    private static final String TAG = "UdfpsAnimationEnroll";



    static final float PROGRESS_BAR_RADIUS = 180.f;

    static final float PROGRESS_BAR_RADIUS = 360.f;



    @NonNull private final Drawable mMovingTargetFpIcon;

    @NonNull private final Paint mSensorOutlinePaint;
@@ -96,11 +96,6 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { 
            return;

        }



        if (mSensorRect != null) {

            canvas.drawOval(mSensorRect, mSensorOutlinePaint);

        }

        mFingerprintDrawable.draw(canvas);



        // Draw moving target

        if (mEnrollHelper.isCenterEnrollmentComplete()) {

            mFingerprintDrawable.setAlpha(mAlpha == 255 ? 64 : mAlpha);
@@ -117,6 +112,10 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { 
            mMovingTargetFpIcon.draw(canvas);

            canvas.restore();

        } else {

            if (mSensorRect != null) {

                canvas.drawOval(mSensorRect, mSensorOutlinePaint);

            }

            mFingerprintDrawable.draw(canvas);

            mFingerprintDrawable.setAlpha(mAlpha);

            mSensorOutlinePaint.setAlpha(mAlpha);

        }