Snap for 10557896 from c8eb80bcc2 to udc-qpr1-release

Change-Id: I439a551506be41b5d74534f091f2a550e96ca384
This commit is contained in:
Android Build Coastguard Worker
2023-07-25 23:19:24 +00:00
2 changed files with 18 additions and 1 deletions

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;

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