Merge "Update remaining enrollment affordance alpha" into sc-dev (502bae3d) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable {
		mSensorOutlinePaint.setAlpha(alpha);
		mBlueFill.setAlpha(alpha);
		mBlueStroke.setAlpha(alpha);
		mMovingTargetFpIcon.setAlpha(alpha);
		invalidateSelf();
		}
		}

+12 −2

Original line number	Diff line number	Diff line
		@@ -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,18 +29,27 @@ 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);
		mFingerprintDrawable = new UdfpsEnrollDrawable(mContext);
		}

		@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