Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6

am: d415cbfc0d

Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130

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

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