Added vibration back to UDFPS#onEnrollmentProgress
Test: Verified haptic is now present. Bug: 222593183 Change-Id: I3aed905e127f4e3eff931e4e35f5929389764b7e
This commit is contained in:
@@ -112,6 +112,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
|
|||||||
private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
|
private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
|
||||||
VibrationAttributes.createForUsage(VibrationAttributes.USAGE_ACCESSIBILITY);
|
VibrationAttributes.createForUsage(VibrationAttributes.USAGE_ACCESSIBILITY);
|
||||||
|
|
||||||
|
private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES =
|
||||||
|
VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK);
|
||||||
|
|
||||||
|
private static final VibrationEffect SUCCESS_VIBRATION_EFFECT =
|
||||||
|
VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
|
||||||
|
|
||||||
private FingerprintManager mFingerprintManager;
|
private FingerprintManager mFingerprintManager;
|
||||||
private boolean mCanAssumeUdfps;
|
private boolean mCanAssumeUdfps;
|
||||||
@Nullable private ProgressBar mProgressBar;
|
@Nullable private ProgressBar mProgressBar;
|
||||||
@@ -509,6 +515,14 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
|
|||||||
mErrorText.removeCallbacks(mTouchAgainRunnable);
|
mErrorText.removeCallbacks(mTouchAgainRunnable);
|
||||||
mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
|
mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
|
||||||
} else {
|
} else {
|
||||||
|
if (mVibrator != null) {
|
||||||
|
mVibrator.vibrate(Process.myUid(),
|
||||||
|
getApplicationContext().getOpPackageName(),
|
||||||
|
SUCCESS_VIBRATION_EFFECT,
|
||||||
|
getClass().getSimpleName() + "::OnEnrollmentProgressChanged",
|
||||||
|
HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES);
|
||||||
|
}
|
||||||
|
|
||||||
if (mIsAccessibilityEnabled) {
|
if (mIsAccessibilityEnabled) {
|
||||||
final int percent = (int) (((float)(steps - remaining) / (float) steps) * 100);
|
final int percent = (int) (((float)(steps - remaining) / (float) steps) * 100);
|
||||||
CharSequence cs = getString(
|
CharSequence cs = getString(
|
||||||
@@ -582,7 +596,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
|
|||||||
}
|
}
|
||||||
if (isResumed() && (mIsAccessibilityEnabled || !mCanAssumeUdfps)) {
|
if (isResumed() && (mIsAccessibilityEnabled || !mCanAssumeUdfps)) {
|
||||||
mVibrator.vibrate(Process.myUid(), getApplicationContext().getOpPackageName(),
|
mVibrator.vibrate(Process.myUid(), getApplicationContext().getOpPackageName(),
|
||||||
VIBRATE_EFFECT_ERROR, "FingerprintEnrollEnrolling:showError",
|
VIBRATE_EFFECT_ERROR, getClass().getSimpleName() + "::showError",
|
||||||
FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
|
FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user