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

Commit 45038c6e authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib7b7a95f979c4fc30b0c1d7cf2c31475b6c396b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6412155 65627163

core/java/android/hardware/fingerprint/FingerprintManager.java

+10 −3
Original line number Original line Diff line number Diff line
@@ -1433,10 +1433,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
    }

    }





    @NonNull

    @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

        // TODO(b/200604947): Fetch this value from FingerprintService, rather than internal config

        final String[] enrollStageThresholdStrings = context.getResources().getStringArray(

        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);

                    com.android.internal.R.array.config_udfps_enroll_stage_thresholds);

        }





        final float[] enrollStageThresholds = new float[enrollStageThresholdStrings.length];

        final float[] enrollStageThresholds = new float[enrollStageThresholdStrings.length];

        for (int i = 0; i < enrollStageThresholds.length; i++) {

        for (int i = 0; i < enrollStageThresholds.length; i++) {

core/res/res/values/config.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -4843,6 +4843,14 @@ 
        <item>0.875</item>

        <item>0.875</item>

    </string-array>

    </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

    <!-- 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.

         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 -->

         Entries are defined in android.hardware.biometrics.face@1.0 types.hal -->

core/res/res/values/symbols.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2691,7 +2691,7 @@ 
  <java-symbol type="integer" name="config_udfps_illumination_transition_ms" />

  <java-symbol type="integer" name="config_udfps_illumination_transition_ms" />

  <java-symbol type="bool" name="config_is_powerbutton_fps" />

  <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_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_enroll_ignorelist" />

  <java-symbol type="array" name="config_face_acquire_vendor_enroll_ignorelist" />

  <java-symbol type="array" name="config_face_acquire_vendor_enroll_ignorelist" />

  <java-symbol type="array" name="config_face_acquire_keyguard_ignorelist" />

  <java-symbol type="array" name="config_face_acquire_keyguard_ignorelist" />

packages/SystemUI/res/layout/sidefps_view.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,4 +23,4 @@ 
    app:lottie_autoPlay="true"

    app:lottie_autoPlay="true"

    app:lottie_loop="true"

    app:lottie_loop="true"

    app:lottie_rawRes="@raw/sfps_pulse"

    app:lottie_rawRes="@raw/sfps_pulse"

    android:contentDescription="@string/accessibility_fingerprint_label"/>
 
    android:importantForAccessibility="no"/>
 
 No newline at end of file