Add dialog when user touches fingerprint icon

Bug: 20495507
Change-Id: I6779aba7ca988fd9a8eee07afca2a410de144a26
This commit is contained in:
Jorim Jaggi
2015-04-23 17:16:43 -07:00
parent 2fef19dd16
commit 3b7f2efd95
2 changed files with 51 additions and 0 deletions

View File

@@ -18,12 +18,17 @@ package com.android.settings.fingerprint;
import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.PowerManager;
import android.os.SystemClock;
import android.view.MotionEvent;
import android.view.View;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
@@ -42,6 +47,12 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase {
private static final int PROGRESS_BAR_MAX = 10000;
private static final int FINISH_DELAY = 250;
/**
* How many times the user needs to touch the icon until we show the dialog that this is not the
* fingerprint sensor.
*/
private static final int ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN = 3;
private PowerManager mPowerManager;
private CancellationSignal mEnrollmentCancel = new CancellationSignal();
private int mEnrollmentSteps;
@@ -53,6 +64,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase {
private TextView mRepeatMessage;
private TextView mErrorText;
private Interpolator mFastOutSlowInInterpolator;
private int mIconTouchCount;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -67,6 +79,19 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase {
mFingerprintAnimator = (ImageView) findViewById(R.id.fingerprint_animator);
mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(
this, android.R.interpolator.fast_out_slow_in);
findViewById(R.id.fingerprint_animator).setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
mIconTouchCount++;
if (mIconTouchCount == ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN) {
showIconTouchDialog();
mIconTouchCount = 0;
}
}
return true;
}
});
startEnrollment();
}
@@ -125,6 +150,10 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase {
}
}
private void showIconTouchDialog() {
new IconTouchDialog().show(getFragmentManager(), null /* tag */);
}
private final Animator.AnimatorListener mProgressAnimationListener
= new Animator.AnimatorListener() {
@@ -184,4 +213,22 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase {
launchFinish(mToken);
}
};
private static class IconTouchDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.security_settings_fingerprint_enroll_touch_dialog_title)
.setMessage(R.string.security_settings_fingerprint_enroll_touch_dialog_message)
.setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
});
return builder.create();
}
}
}