From 05d275bf078c24a0912071760718c0a90c89ab3d Mon Sep 17 00:00:00 2001 From: Milton Wu Date: Wed, 22 Feb 2023 11:31:33 +0800 Subject: [PATCH] Update theme transition for fingerprint in U Apply suw transition for fingerprint 1. Fix incorrect animation between Lock and Fingeprint in Suw 2. Fix incorrect animation between Fingeprint and FaceLock in Suw 3. Remove unnecessary overridePendingAnimation during Enorlling 4. Fix no animation in biometrics v2 because of incorrect calling order in FragmentTransaction Bug: 269063515 Test: Manually test transition animation for fingerprint enrollments Change-Id: I12475dae5cb2905c81b24d3b57438b898afa1e27 --- .../biometrics/BiometricEnrollActivity.java | 10 ++++++++++ .../biometrics/BiometricsEnrollEnrolling.java | 2 -- .../ui/view/FingerprintEnrollmentActivity.java | 18 ++++++++++++------ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java index e63a754e3e3..af581b85dba 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -22,6 +22,8 @@ import static android.provider.Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED; import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT_DENIED; import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT_GRANTED; +import static com.google.android.setupdesign.transition.TransitionHelper.TRANSITION_FADE_THROUGH; + import android.annotation.NonNull; import android.app.Activity; import android.app.admin.DevicePolicyManager; @@ -55,6 +57,7 @@ import com.android.settings.password.ChooseLockPattern; import com.android.settings.password.ChooseLockSettingsHelper; import com.google.android.setupcompat.util.WizardManagerHelper; +import com.google.android.setupdesign.transition.TransitionHelper; import java.util.List; @@ -457,6 +460,9 @@ public class BiometricEnrollActivity extends InstrumentedActivity { final boolean isOk = isSuccessfulConfirmOrChooseCredential(requestCode, resultCode); if (isOk && (mHasFeatureFace || mHasFeatureFingerprint)) { + // Apply forward animation during the transition from ChooseLock/ConfirmLock to + // SetupFingerprintEnrollIntroduction/FingerprintEnrollmentActivity + TransitionHelper.applyForwardTransition(this, TRANSITION_FADE_THROUGH); updateGatekeeperPasswordHandle(data); if (mHasFeatureFingerprint) { launchFingerprintOnlyEnroll(); @@ -473,6 +479,10 @@ public class BiometricEnrollActivity extends InstrumentedActivity { mIsSingleEnrolling = false; if ((resultCode == BiometricEnrollBase.RESULT_SKIP || resultCode == BiometricEnrollBase.RESULT_FINISHED) && mHasFeatureFace) { + // Apply forward animation during the transition from + // SetupFingerprintEnroll*/FingerprintEnrollmentActivity to + // SetupFaceEnrollIntroduction + TransitionHelper.applyForwardTransition(this, TRANSITION_FADE_THROUGH); launchFaceOnlyEnroll(); } else { finishOrLaunchHandToParent(resultCode); diff --git a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java index 2a1d049af1b..7051b70ee92 100644 --- a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java @@ -21,7 +21,6 @@ import android.content.Intent; import android.os.UserHandle; import android.view.View; -import com.android.settings.R; import com.android.settings.password.ChooseLockSettingsHelper; /** @@ -120,7 +119,6 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase intent.putExtra(Intent.EXTRA_USER_ID, mUserId); } startActivity(intent); - overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out); finish(); } diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.java b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.java index 7f69b91d9e8..62928af9700 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.java +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.java @@ -267,9 +267,11 @@ public class FingerprintEnrollmentActivity extends FragmentActivity { } else { getSupportFragmentManager().beginTransaction() .setReorderingAllowed(true) + .setCustomAnimations(R.anim.shared_x_axis_activity_open_enter_dynamic_color, + R.anim.shared_x_axis_activity_open_exit, + R.anim.shared_x_axis_activity_close_enter_dynamic_color, + R.anim.shared_x_axis_activity_close_exit) .replace(R.id.fragment_container_view, fragmentClass, null, tag) - .setCustomAnimations(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out, - R.anim.sud_slide_back_in, R.anim.sud_slide_back_out) .addToBackStack(tag) .commit(); } @@ -373,20 +375,24 @@ public class FingerprintEnrollmentActivity extends FragmentActivity { // Replace enrolling page getSupportFragmentManager().beginTransaction() .setReorderingAllowed(true) + .setCustomAnimations(R.anim.shared_x_axis_activity_open_enter_dynamic_color, + R.anim.shared_x_axis_activity_open_exit, + R.anim.shared_x_axis_activity_close_enter_dynamic_color, + R.anim.shared_x_axis_activity_close_exit) .replace(R.id.fragment_container_view, FingerprintEnrollFinishFragment.class, null, FINISH_TAG) - .setCustomAnimations(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out, - R.anim.sud_slide_back_in, R.anim.sud_slide_back_out) .commit(); } else { // Remove Enrolling page from backstack, and add Finish page. Latest backstack will // be changed from Intro->FindSensor->Enrolling to Intro->FindSensor->Finish getSupportFragmentManager().beginTransaction() .setReorderingAllowed(true) + .setCustomAnimations(R.anim.shared_x_axis_activity_open_enter_dynamic_color, + R.anim.shared_x_axis_activity_open_exit, + R.anim.shared_x_axis_activity_close_enter_dynamic_color, + R.anim.shared_x_axis_activity_close_exit) .replace(R.id.fragment_container_view, FingerprintEnrollFinishFragment.class, null, FINISH_TAG) - .setCustomAnimations(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out, - R.anim.sud_slide_back_in, R.anim.sud_slide_back_out) .addToBackStack(FINISH_TAG) .commit(); }