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

Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev

Browse Source
This commit is contained in:
Bill Lin
2023-07-25 01:30:28 +00:00
committed by Android (Google) Code Review
parent fcea32c091 a851e68272
commit c8eb80bcc2
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/fingerprint/UdfpsEnrollProgressBarDrawable.java
View File

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

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

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