PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2022-10-08 07:20:50 +00:00
committed by Automerger Merge Worker
parent 97d375875a d776340d33
commit 0b79b2ed99
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -669,6 +669,14 @@ public class FingerprintSettings extends SubSettings {
mLaunchedConfirm = false; mLaunchedConfirm = false;
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) { if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) { 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, mFingerprintManager.generateChallenge(mUserId,
(sensorId, userId, challenge) -> { (sensorId, userId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(getActivity(), mToken = BiometricUtils.requestGatekeeperHat(getActivity(),