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

Revert "Implement sfps enroll improvement feature with feature provider"

Browse Source 
This reverts commit 2ffe187d1b.

Reason for revert: Likely culprit for b/305048300

Change-Id: Ia9d2d98bcb09d63dacde7134c20ded2ed51f9ab4
This commit is contained in:
Priyanka Advani
2023-10-12 19:02:20 +00:00
committed by Android (Google) Code Review
parent 2ffe187d1b
commit a99bab5b57
13 changed files with 41 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
View File

@@ -1,89 +0,0 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.biometrics.fingerprint.feature;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.SFPS_STAGE_CENTER;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.SFPS_STAGE_FINGERTIP;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.SFPS_STAGE_LEFT_EDGE;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.SFPS_STAGE_NO_ANIMATION;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.SFPS_STAGE_RIGHT_EDGE;
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling.STAGE_UNKNOWN;
import android.content.Context;
import android.hardware.fingerprint.FingerprintManager;
import androidx.annotation.NonNull;
import com.android.settings.R;
import java.util.function.Function;
public class SfpsEnrollmentFeatureImpl implements SfpsEnrollmentFeature {
private FingerprintManager mFingerprintManager;
@Override
public int getCurrentSfpsEnrollStage(int progressSteps, Function<Integer, Integer> mapper) {
if (mapper == null) {
return STAGE_UNKNOWN;
}
if (progressSteps < mapper.apply(0)) {
return SFPS_STAGE_NO_ANIMATION;
} else if (progressSteps < mapper.apply(1)) {
return SFPS_STAGE_CENTER;
} else if (progressSteps < mapper.apply(2)) {
return SFPS_STAGE_FINGERTIP;
} else if (progressSteps < mapper.apply(3)) {
return SFPS_STAGE_LEFT_EDGE;
} else {
return SFPS_STAGE_RIGHT_EDGE;
}
}
@Override
public int getFeaturedStageHeaderResource(int stage) {
return switch (stage) {
case SFPS_STAGE_NO_ANIMATION
-> R.string.security_settings_fingerprint_enroll_repeat_title;
case SFPS_STAGE_CENTER -> R.string.security_settings_sfps_enroll_finger_center_title;
case SFPS_STAGE_FINGERTIP -> R.string.security_settings_sfps_enroll_fingertip_title;
case SFPS_STAGE_LEFT_EDGE -> R.string.security_settings_sfps_enroll_left_edge_title;
case SFPS_STAGE_RIGHT_EDGE -> R.string.security_settings_sfps_enroll_right_edge_title;
default -> throw new IllegalArgumentException("Invalid stage: " + stage);
};
}
@Override
public int getSfpsEnrollLottiePerStage(int stage) {
return switch (stage) {
case SFPS_STAGE_NO_ANIMATION -> R.raw.sfps_lottie_no_animation;
case SFPS_STAGE_CENTER -> R.raw.sfps_lottie_pad_center;
case SFPS_STAGE_FINGERTIP -> R.raw.sfps_lottie_tip;
case SFPS_STAGE_LEFT_EDGE -> R.raw.sfps_lottie_left_edge;
case SFPS_STAGE_RIGHT_EDGE -> R.raw.sfps_lottie_right_edge;
default -> throw new IllegalArgumentException("Invalid stage: " + stage);
};
}
@Override
public float getEnrollStageThreshold(@NonNull Context context, int index) {
if (mFingerprintManager == null) {
mFingerprintManager = context.getSystemService(FingerprintManager.class);
}
return mFingerprintManager.getEnrollStageThreshold(index);
}
}