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

Commit 8f463f5c authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Fix final UDFPS enrollment haptic." into tm-dev

parents 5ef52de6 b7f3001c

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

+2 −15
Original line number Diff line number Diff line
@@ -112,12 +112,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
    private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =

            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 boolean mCanAssumeUdfps;

    @Nullable private ProgressBar mProgressBar;
@@ -515,14 +509,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
            mErrorText.removeCallbacks(mTouchAgainRunnable);

            mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);

        } else {

            if (mVibrator != null) {

                mVibrator.vibrate(Process.myUid(),

                        getApplicationContext().getOpPackageName(),

                        SUCCESS_VIBRATION_EFFECT,

                        getClass().getSimpleName() + "::OnEnrollmentProgressChanged",

                        HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES);

            }



            if (mIsAccessibilityEnabled) {

                final int percent = (int) (((float)(steps - remaining) / (float) steps) * 100);

                CharSequence cs = getString(
@@ -594,7 +580,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
                mErrorText.setTranslationY(0f);

            }

        }

        if (isResumed() && (mIsAccessibilityEnabled || !mCanAssumeUdfps)) {



        if (isResumed() && mIsAccessibilityEnabled && !mCanAssumeUdfps) {

            mVibrator.vibrate(Process.myUid(), getApplicationContext().getOpPackageName(),

                    VIBRATE_EFFECT_ERROR, getClass().getSimpleName() + "::showError",

                    FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);