Settings: Replace fingeprint_find_sensor_location with lottie (fe8090af) · Commits · e / os / android_packages_apps_Settings

res/layout/fingerprint_enroll_find_sensor_graphic.xml

+7 −10

Original line number	Diff line number	Diff line
		@@ -21,13 +21,15 @@
		android:layout_height="wrap_content"
		android:paddingTop="@dimen/fingerprint_find_sensor_padding_top">

		<ImageView
		android:id="@+id/fingerprint_sensor_location"
		<!-- Animation res MUST be set in code because asset is dependent on device orientation -->
		<com.airbnb.lottie.LottieAnimationView
		android:id="@+id/fingerprint_sensor_location_lottie"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
		android:src="@drawable/fingerprint_sensor_location"
		android:scaleType="centerInside"/>
		android:scaleType="centerInside"
		app:lottie_rawRes="@raw/fingerprint_sensor_location_lottie"
		app:lottie_autoPlay="true"
		app:lottie_loop="true"/>

		<ImageView
		android:id="@+id/fingerprint_sensor_location_front_overlay"
		@@ -38,9 +40,4 @@
		android:scaleType="centerInside"
		android:visibility="gone"/>

		<com.android.settings.biometrics.fingerprint.FingerprintLocationAnimationView
		android:id="@+id/fingerprint_sensor_location_animation"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>

		</FrameLayout>

res/raw/fingerprint_sensor_location_lottie.json

0 → 100644

+1 −0

File added.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -46,9 +46,6 @@ import java.util.List;
		public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		BiometricEnrollSidecar.Listener {

		@Nullable
		private FingerprintFindSensorAnimation mAnimation;

		private FingerprintEnrollSidecar mSidecar;
		private boolean mNextClicked;
		private boolean mCanAssumeUdfps;
		@@ -134,7 +131,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		throw new IllegalStateException("HAT and GkPwHandle both missing...");
		}

		mAnimation = null;
		if (mCanAssumeUdfps) {
		LottieAnimationView lottieAnimationView = findViewById(R.id.illustration_lottie);
		lottieAnimationView.setOnClickListener(new OnClickListener() {
		@@ -143,11 +139,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		onStartButtonClick(v);
		}
		});
		} else {
		View animationView = findViewById(R.id.fingerprint_sensor_location_animation);
		if (animationView instanceof FingerprintFindSensorAnimation) {
		mAnimation = (FingerprintFindSensorAnimation) animationView;
		}
		}
		}

		@@ -167,9 +158,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		@Override
		protected void onStart() {
		super.onStart();
		if (mAnimation != null) {
		mAnimation.startAnimation();
		}
		}

		private void stopLookingForFingerprint() {
		@@ -223,9 +211,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		@Override
		protected void onStop() {
		super.onStop();
		if (mAnimation != null) {
		mAnimation.pauseAnimation();
		}
		}

		@Override
		@@ -236,9 +221,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		@Override
		protected void onDestroy() {
		super.onDestroy();
		if (mAnimation != null) {
		mAnimation.stopAnimation();
		}
		}

		private void onStartButtonClick(View view) {