| commit | 0b79b2ed99f5970aef9177828f778217e3a99afd | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Oct 08 07:20:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 08 07:20:50 2022 +0000 |
| tree | fa96d9f545f276044ba193665eafa2c0772ec74b | |
| parent | 97d375875afc5cecfdca7953737744b405f1a845 [diff] | |
| parent | d776340d33957bb323fd3f3941e20721199d1f88 [diff] |
Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d33 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575 Change-Id: I621842329767134c1a18baafa3f125dd1ca49c94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 44b3a40..c031fe6 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -669,6 +669,14 @@ 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(),