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 am: c8eb80bcc2

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

Change-Id: If919e1da98abb430b7d6c79211139c6f2a1e4f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-07-25 01:57:48 +00:00
committed by Automerger Merge Worker
parent aa25f927b3 c8eb80bcc2
commit f71d183d0b
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; return;
} }
mShowingHelp = showingHelp;
if (mShowingHelp) { if (mShowingHelp) {
if (mVibrator != null && mIsAccessibilityEnabled) { if (mVibrator != null && mIsAccessibilityEnabled) {
mVibrator.vibrate(Process.myUid(), mContext.getOpPackageName(), mVibrator.vibrate(Process.myUid(), mContext.getOpPackageName(),
@@ -228,7 +229,6 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable {
} }
} }
mShowingHelp = showingHelp;
mRemainingSteps = remainingSteps; mRemainingSteps = remainingSteps;
mTotalSteps = totalSteps; 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()); 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 @Test
public void fingerprintUdfpsOverlayEnrollment_gainFocus_shouldNotCancel() { public void fingerprintUdfpsOverlayEnrollment_gainFocus_shouldNotCancel() {
initializeActivityFor(TYPE_UDFPS_OPTICAL); initializeActivityFor(TYPE_UDFPS_OPTICAL);