Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 6562716382

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19561857

Change-Id: Ib7b7a95f979c4fc30b0c1d7cf2c31475b6c396b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Grace Cheng
2022-09-01 01:13:36 +00:00
committed by Automerger Merge Worker
parent f641215564 6562716382
commit 45038c6e7b
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/hardware/fingerprint/FingerprintManager.java
View File

@@ -1433,10 +1433,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
}
@NonNull
private static float[] createEnrollStageThresholds(@NonNull Context context) {
@RequiresPermission(USE_BIOMETRIC_INTERNAL)
private float[] createEnrollStageThresholds(@NonNull Context context) {
// TODO(b/200604947): Fetch this value from FingerprintService, rather than internal config
final String[] enrollStageThresholdStrings = context.getResources().getStringArray(
com.android.internal.R.array.config_udfps_enroll_stage_thresholds);
final String[] enrollStageThresholdStrings;
if (isPowerbuttonFps()) {
enrollStageThresholdStrings = context.getResources().getStringArray(
com.android.internal.R.array.config_sfps_enroll_stage_thresholds);
} else {
enrollStageThresholdStrings = context.getResources().getStringArray(
com.android.internal.R.array.config_udfps_enroll_stage_thresholds);
}
final float[] enrollStageThresholds = new float[enrollStageThresholdStrings.length];
for (int i = 0; i < enrollStageThresholds.length; i++) {

8
core/res/res/values/config.xml
View File

@@ -4843,6 +4843,14 @@
<item>0.875</item>
</string-array>
<!-- When each intermediate SFPS enroll stage ends, as a fraction of total progress. -->
<string-array name="config_sfps_enroll_stage_thresholds" translatable="false">
<item>0</item> <!-- [-1 // <0/25] No animation 1x -->
<item>0.36</item> <!-- [0 to 8 // <9/25] Pad center 9x -->
<item>0.52</item> <!-- [9 to 12 // <13/25] Tip 4x -->
<item>0.76</item> <!-- [13 to 18 // <19/25] Left 6x -->
</string-array> <!-- [19 to 24 // <25/25] Right 6x -->
<!-- Messages that should not be shown to the user during face auth enrollment. This should be
used to hide messages that may be too chatty or messages that the user can't do much about.
Entries are defined in android.hardware.biometrics.face@1.0 types.hal -->

2
core/res/res/values/symbols.xml
View File

@@ -2691,7 +2691,7 @@
<java-symbol type="integer" name="config_udfps_illumination_transition_ms" />
<java-symbol type="bool" name="config_is_powerbutton_fps" />
<java-symbol type="array" name="config_udfps_enroll_stage_thresholds" />
<java-symbol type="array" name="config_sfps_enroll_stage_thresholds" />
<java-symbol type="array" name="config_face_acquire_enroll_ignorelist" />
<java-symbol type="array" name="config_face_acquire_vendor_enroll_ignorelist" />
<java-symbol type="array" name="config_face_acquire_keyguard_ignorelist" />

2
packages/SystemUI/res/layout/sidefps_view.xml
View File

@@ -23,4 +23,4 @@
app:lottie_autoPlay="true"
app:lottie_loop="true"
app:lottie_rawRes="@raw/sfps_pulse"
android:contentDescription="@string/accessibility_fingerprint_label"/>
android:importantForAccessibility="no"/>