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

Commit b2aa7e7d authored by Maurice Lam's avatar Maurice Lam Committed by android-build-merger
Browse files

Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705 am:... 

Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705 am: dbfde54f am: d415cbfc
am: 6b5f99bc

Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
parents b5989fc3 6b5f99bc

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

+5 −1
Original line number Diff line number Diff line
@@ -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;
@@ -299,7 +300,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