Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 996a6848 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am:... 

Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d am: 0b79b2ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575



Change-Id: I5105e56934854a74bb05b90577b9853e74f41b69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38eb8fea 0b79b2ed

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

+8 −0
Original line number Diff line number Diff line
@@ -669,6 +669,14 @@ public class FingerprintSettings extends SubSettings { 
                mLaunchedConfirm = false;

                if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {

                    if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) {

                        if (!mHasFirstEnrolled && !mIsEnrolling) {

                            final Activity activity = getActivity();

                            if (activity != null) {

                                // Apply pending transition for auto adding first fingerprint case

                                activity.overridePendingTransition(R.anim.sud_slide_next_in,

                                        R.anim.sud_slide_next_out);

                            }

                        }

                        mFingerprintManager.generateChallenge(mUserId,

                                (sensorId, userId, challenge) -> {

                                    mToken = BiometricUtils.requestGatekeeperHat(getActivity(),