Merge "Enable easier burn in testing" into sc-dev (781fa180) · Commits · e / os / android_frameworks_base

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -19,8 +19,10 @@ package com.android.systemui.biometrics;
		import android.content.Context;
		import android.graphics.RectF;
		import android.graphics.drawable.Drawable;
		import android.view.View;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.systemui.R;

		@@ -33,6 +35,7 @@ public abstract class UdfpsAnimation extends Drawable {

		@NonNull protected final Context mContext;
		@NonNull protected final Drawable mFingerprintDrawable;
		@Nullable private View mView;

		public UdfpsAnimation(@NonNull Context context) {
		mContext = context;
		@@ -53,6 +56,10 @@ public abstract class UdfpsAnimation extends Drawable {
		mFingerprintDrawable.setAlpha(alpha);
		}

		public void setAnimationView(UdfpsAnimationView view) {
		mView = view;
		}

		/**
		* @return The amount of padding that's needed on each side of the sensor, in pixels.
		*/
		@@ -66,4 +73,10 @@ public abstract class UdfpsAnimation extends Drawable {
		public int getPaddingY() {
		return 0;
		}

		protected void postInvalidateView() {
		if (mView != null) {
		mView.postInvalidate();
		}
		}
		}

+3 −6

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.graphics.Canvas;
		import android.graphics.Color;
		import android.graphics.ColorFilter;
		import android.util.MathUtils;
		import android.view.View;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		@@ -42,7 +41,6 @@ public class UdfpsAnimationKeyguard extends UdfpsAnimation implements DozeReceiv

		private static final String TAG = "UdfpsAnimationKeyguard";

		@NonNull private final View mParent;
		@NonNull private final Context mContext;
		private final int mMaxBurnInOffsetX;
		private final int mMaxBurnInOffsetY;
		@@ -52,10 +50,9 @@ public class UdfpsAnimationKeyguard extends UdfpsAnimation implements DozeReceiv
		private float mBurnInOffsetX;
		private float mBurnInOffsetY;

		UdfpsAnimationKeyguard(@NonNull View parent, @NonNull Context context,
		UdfpsAnimationKeyguard(@NonNull Context context,
		@NonNull StatusBarStateController statusBarStateController) {
		super(context);
		mParent = parent;
		mContext = context;

		mMaxBurnInOffsetX = context.getResources()
		@@ -73,10 +70,10 @@ public class UdfpsAnimationKeyguard extends UdfpsAnimation implements DozeReceiv
		mInterpolatedDarkAmount);
		mBurnInOffsetY = MathUtils.lerp(0f,
		getBurnInOffset(mMaxBurnInOffsetY * 2, false /* xAxis */)
		- 0.5f * mMaxBurnInOffsetY,
		- mMaxBurnInOffsetY,
		mInterpolatedDarkAmount);
		updateColor();
		mParent.postInvalidate();
		postInvalidateView();
		}

		@Override

+7 −0

Original line number	Diff line number	Diff line
		@@ -74,7 +74,14 @@ public class UdfpsAnimationView extends View implements DozeReceiver,
		}

		void setAnimation(@Nullable UdfpsAnimation animation) {
		if (mUdfpsAnimation != null) {
		mUdfpsAnimation.setAnimationView(null);
		}

		mUdfpsAnimation = animation;
		if (mUdfpsAnimation != null) {
		mUdfpsAnimation.setAnimationView(this);
		}
		}

		void onSensorRectUpdated(@NonNull RectF sensorRect) {

+1 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.doze.DozeReceiver;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.phone.ScrimController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.util.concurrency.DelayableExecutor;

		@@ -324,7 +323,7 @@ public class UdfpsController implements DozeReceiver, HbmCallback {
		case IUdfpsOverlayController.REASON_ENROLL_ENROLLING:
		return new UdfpsAnimationEnroll(mContext);
		case IUdfpsOverlayController.REASON_AUTH_FPM_KEYGUARD:
		return new UdfpsAnimationKeyguard(mView, mContext, mStatusBarStateController);
		return new UdfpsAnimationKeyguard(mContext, mStatusBarStateController);
		case IUdfpsOverlayController.REASON_AUTH_FPM_OTHER:
		return new UdfpsAnimationFpmOther(mContext);
		default:

+1 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin

		void setExtras(@Nullable UdfpsAnimation animation, @Nullable UdfpsEnrollHelper enrollHelper) {
		mAnimationView.setAnimation(animation);

		mEnrollHelper = enrollHelper;

		if (enrollHelper != null) {