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

Commit a851e682 authored by lbill's avatar lbill
Browse files

Fix no vibration when enroll init stage after receive onEnrollmentHelp 

Change the behavior of vibration when
1. Init stage, don't vibrate if onEnrollmentHelp invoke
2. Then next enroll progress update, should vibrate

Note: This onEnrollmentHelp is invoked by FINGERPRINT_ACQUIRED_PARTIAL

Test: Should vibration when the progress 1st indicating after lightly press
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 290723009
Change-Id: Ie056aac8b3251fb3da6dccd95254fb30628fa65e
parent 2fdc9c94

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

+1 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
            return;

        }



        mShowingHelp = showingHelp;

        if (mShowingHelp) {

            if (mVibrator != null && mIsAccessibilityEnabled) {

                mVibrator.vibrate(Process.myUid(), mContext.getOpPackageName(),
@@ -228,7 +229,6 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
            }

        }



        mShowingHelp = showingHelp;

        mRemainingSteps = remainingSteps;

        mTotalSteps = totalSteps;

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

+17 −0
Original line number Diff line number Diff line
@@ -147,6 +147,23 @@ public class FingerprintEnrollEnrollingTest { 
        verify(mVibrator, never()).vibrate(anyInt(), anyString(), any(), anyString(), any());

    }



    @Test

    public void fingerprintUdfpsEnrollInitStage_afterOnEnrollmentHelp_shouldVibrate() {

        initializeActivityFor(TYPE_UDFPS_OPTICAL);



        assertThat(getLayout().getDescriptionText()).isNotEqualTo("");



        mActivity.configureEnrollmentStage(0 /* lottie */);

        mActivity.onEnrollmentHelp(1/* FINGERPRINT_ACQUIRED_PARTIAL */, mContext.getString(

                com.android.internal.R.string.fingerprint_acquired_partial));



        verify(mVibrator, never()).vibrate(anyInt(), anyString(), any(), anyString(), any());



        mActivity.onEnrollmentProgressChange(1, 1);

        verify(mVibrator).vibrate(anyInt(), anyString(), any(), anyString(), any());



    }



    @Test

    public void fingerprintUdfpsOverlayEnrollment_gainFocus_shouldNotCancel() {

        initializeActivityFor(TYPE_UDFPS_OPTICAL);