Merge "Show help string when onEnrollmentHelp() is called"

This commit is contained in:
Maurice Lam
2017-08-08 22:02:20 +00:00
committed by Gerrit Code Review

View File

@@ -33,6 +33,7 @@ import android.graphics.drawable.Drawable;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.text.TextUtils;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
@@ -264,7 +265,10 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
@Override @Override
public void onEnrollmentHelp(CharSequence helpString) { public void onEnrollmentHelp(CharSequence helpString) {
mErrorText.setText(helpString); if (!TextUtils.isEmpty(helpString)) {
mErrorText.removeCallbacks(mTouchAgainRunnable);
showError(helpString);
}
} }
@Override @Override