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

Commit c52d4922 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590



Change-Id: I8fdd0725e4c0a1b0d2f7ced3ce058522566528f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 240835c7 2d343061

res/values/arrays.xml

+0 −5
Original line number Diff line number Diff line
@@ -1664,9 +1664,4 @@ 
         [CHAR LIMIT=NONE] -->

    <string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">

    </string-array>



    <!-- Array containing help message codes that should not be displayed

         during fingerprint enrollment. -->

    <integer-array name="fingerprint_acquired_ignore_list">

    </integer-array>

</resources>

res/values/config.xml

+7 −0
Original line number Diff line number Diff line
@@ -648,4 +648,11 @@ 


    <!-- Whether the toggle for Auto-rotate with Face Detection should be shown. -->

    <bool name="config_auto_rotate_face_detection_available">true</bool>

    <!-- In the case of receiving both help and progress message, display progress message. -->

    <bool name="enrollment_progress_priority_over_help">false</bool>

    <!-- Prioritize help message by their occurrence -->

    <bool name="enrollment_prioritize_acquire_messages">false</bool>

    <!-- Control messages displayed during enrollment -->

    <bool name="enrollment_message_display_controller_flag">false</bool>



</resources>

res/values/integers.xml

+7 −0
Original line number Diff line number Diff line
@@ -26,4 +26,11 @@ 
    <integer name="suw_max_faces_enrollable">1</integer>

    <!-- Controls the maximum number of fingerprints enrollable during SUW -->

    <integer name="suw_max_fingerprints_enrollable">1</integer>



    <!-- Minimum display time (in millis) for help messages in fingerprint enrollment. -->

    <integer name="enrollment_help_minimum_time_display">0</integer>

    <!-- Minimum display time (in millis) for progress messages in fingerprint enrollment. -->

    <integer name="enrollment_progress_minimum_time_display">0</integer>

    <!-- The time (in millis) to wait to collect messages in fingerprint enrollment before displaying it. -->

    <integer name="enrollment_collect_time">0</integer>

</resources>

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+2 −2
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


    @Override

    protected BiometricEnrollSidecar getSidecar() {

        final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar();

        sidecar.setEnrollReason(FingerprintManager.ENROLL_ENROLL);

        final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar(this,

                FingerprintManager.ENROLL_ENROLL);

        return sidecar;

    }

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+2 −2
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
        mSidecar = (FingerprintEnrollSidecar) getSupportFragmentManager().findFragmentByTag(

                FingerprintEnrollEnrolling.TAG_SIDECAR);

        if (mSidecar == null) {

            mSidecar = new FingerprintEnrollSidecar();

            mSidecar.setEnrollReason(FingerprintManager.ENROLL_FIND_SENSOR);

            mSidecar = new FingerprintEnrollSidecar(this,

                    FingerprintManager.ENROLL_FIND_SENSOR);

            getSupportFragmentManager().beginTransaction()

                    .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR)

                    .commitAllowingStateLoss();