PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6b5f99bcbd

Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
This commit is contained in:
Maurice Lam
2017-08-09 00:02:12 +00:00
committed by android-build-merger
parent b5989fc3b7 6b5f99bcbd
commit b2aa7e7da0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -32,6 +32,7 @@ import android.graphics.drawable.LayerDrawable;
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;
@@ -299,7 +300,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