From ba0a012b5783c71ff1f589949fbbde3a41d20b54 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Mon, 1 Nov 2021 19:36:00 +0000 Subject: [PATCH] Revert "Update animation for fingerprint edu page" Revert submission 16091075-update_lottie_fp_edu Reason for revert: Droidfood Blocking Bug: 204719520 Reverted Changes: I0c3b1ad93:Update animation for fingerprint edu page Id07ee17fa:Update animation for fingerprint edu page Change-Id: I0f301491c2b526443a40b916ac2d98093d80a759 --- .../fingerprint_enroll_find_sensor_base.xml | 23 ------- res/raw/fingerprint_edu_lottie.json | 0 res/raw/fingerprint_edu_lottie_portrait.json | 0 .../FingerprintEnrollFindSensor.java | 67 +------------------ 4 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 res/raw/fingerprint_edu_lottie.json delete mode 100644 res/raw/fingerprint_edu_lottie_portrait.json diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml index da7fc309711..62203f71c81 100644 --- a/res/layout/fingerprint_enroll_find_sensor_base.xml +++ b/res/layout/fingerprint_enroll_find_sensor_base.xml @@ -17,7 +17,6 @@ - - - - diff --git a/res/raw/fingerprint_edu_lottie.json b/res/raw/fingerprint_edu_lottie.json deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/res/raw/fingerprint_edu_lottie_portrait.json b/res/raw/fingerprint_edu_lottie_portrait.json deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index 64e066ec00c..3cea9629069 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -21,14 +21,13 @@ import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.os.Bundle; -import android.view.OrientationEventListener; -import android.view.Surface; import android.view.View; import android.view.View.OnClickListener; import android.view.accessibility.AccessibilityManager; import androidx.annotation.Nullable; +import com.airbnb.lottie.LottieAnimationView; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollBase; @@ -36,7 +35,6 @@ import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.biometrics.BiometricUtils; import com.android.settings.password.ChooseLockSettingsHelper; -import com.airbnb.lottie.LottieAnimationView; import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; @@ -54,10 +52,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements private FingerprintEnrollSidecar mSidecar; private boolean mNextClicked; private boolean mCanAssumeUdfps; - private boolean mCanAssumeSidefps; - - private OrientationEventListener mOrientationEventListener; - private int mPreviousRotation = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -67,7 +61,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements final List props = fingerprintManager.getSensorPropertiesInternal(); mCanAssumeUdfps = props != null && props.size() == 1 && props.get(0).isAnyUdfpsType(); - mCanAssumeSidefps = props != null && props.size() == 1 && props.get(0).isAnySidefpsType(); setContentView(getContentView()); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin.setSecondaryButton( @@ -79,8 +72,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements .build() ); - listenOrientationEvent(); - if (mCanAssumeUdfps) { setHeaderText(R.string.security_settings_udfps_enroll_find_sensor_title); setDescriptionText(R.string.security_settings_udfps_enroll_find_sensor_message); @@ -99,28 +90,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements lottieAnimationView.setAnimation(R.raw.udfps_edu_a11y_lottie); } - } else if (mCanAssumeSidefps) { - setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title); - setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message); - final LottieAnimationView lottieAnimationView = findViewById(R.id.illustration_lottie); - final LottieAnimationView lottieAnimationViewPortrait = - findViewById(R.id.illustration_lottie_portrait); - final int rotation = getApplicationContext().getDisplay().getRotation(); - switch(rotation) { - case Surface.ROTATION_90: - lottieAnimationView.setVisibility(View.GONE); - lottieAnimationViewPortrait.setVisibility(View.VISIBLE); - break; - case Surface.ROTATION_270: - lottieAnimationView.setVisibility(View.GONE); - lottieAnimationViewPortrait.setVisibility(View.VISIBLE); - lottieAnimationViewPortrait.setRotation(180); - break; - default: - lottieAnimationView.setVisibility(View.VISIBLE); - lottieAnimationViewPortrait.setVisibility(View.GONE); - break; - } } else { setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title); setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message); @@ -251,7 +220,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements @Override protected void onDestroy() { - stopListenOrientationEvent(); super.onDestroy(); if (mAnimation != null) { mAnimation.stopAnimation(); @@ -329,37 +297,4 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements public int getMetricsCategory() { return SettingsEnums.FINGERPRINT_FIND_SENSOR; } - - private void listenOrientationEvent() { - if (!mCanAssumeSidefps) { - // Do nothing if the device doesn't support SideFPS. - return; - } - mOrientationEventListener = new OrientationEventListener(this) { - @Override - public void onOrientationChanged(int orientation) { - final int currentRotation = getDisplay().getRotation(); - if ((mPreviousRotation == Surface.ROTATION_90 - && currentRotation == Surface.ROTATION_270) || ( - mPreviousRotation == Surface.ROTATION_270 - && currentRotation == Surface.ROTATION_90)) { - mPreviousRotation = currentRotation; - recreate(); - } - } - }; - mOrientationEventListener.enable(); - mPreviousRotation = getDisplay().getRotation(); - } - - private void stopListenOrientationEvent() { - if (!mCanAssumeSidefps) { - // Do nothing if the device doesn't support SideFPS. - return; - } - if (mOrientationEventListener != null) { - mOrientationEventListener.disable(); - } - mOrientationEventListener = null; - } }