diff options
3 files changed, 19 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java index 2036150d3679..cef0ce19edb6 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java @@ -71,8 +71,12 @@ abstract class UdfpsAnimationView extends FrameLayout { return false; } - private void updateAlpha() { - getDrawable().setAlpha(mPauseAuth ? mAlpha : 255); + protected void updateAlpha() { + getDrawable().setAlpha(calculateAlpha()); + } + + protected final int calculateAlpha() { + return mPauseAuth ? mAlpha : 255; } private int expansionToAlpha(float expansion) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java index 727a40d313e0..cd5abd74c260 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java @@ -128,6 +128,7 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { mSensorOutlinePaint.setAlpha(alpha); mBlueFill.setAlpha(alpha); mBlueStroke.setAlpha(alpha); + mMovingTargetFpIcon.setAlpha(alpha); invalidateSelf(); } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java index 7985d95c7c61..75e8638e43df 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java @@ -20,6 +20,7 @@ import android.content.Context; import android.util.AttributeSet; import android.widget.ImageView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.systemui.R; @@ -28,8 +29,9 @@ import com.android.systemui.R; * View corresponding with udfps_enroll_view.xml */ public class UdfpsEnrollView extends UdfpsAnimationView { - private final UdfpsEnrollDrawable mFingerprintDrawable; - private ImageView mFingerprintView; + @NonNull private final UdfpsEnrollDrawable mFingerprintDrawable; + @NonNull private ImageView mFingerprintView; + @NonNull private UdfpsProgressBar mProgressBar; public UdfpsEnrollView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); @@ -37,9 +39,17 @@ public class UdfpsEnrollView extends UdfpsAnimationView { } @Override + protected void updateAlpha() { + super.updateAlpha(); + mProgressBar.setAlpha(calculateAlpha()); + mProgressBar.getProgressDrawable().setAlpha(calculateAlpha()); + } + + @Override protected void onFinishInflate() { mFingerprintView = findViewById(R.id.udfps_enroll_animation_fp_view); mFingerprintView.setImageDrawable(mFingerprintDrawable); + mProgressBar = findViewById(R.id.progress_bar); } @Override |