diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-07-30 20:16:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-30 20:16:08 +0000 |
commit | 92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3 (patch) | |
tree | f97fb8adf1181a901a7b3a56f543b91f435c0cc8 /src/com/android/settings/fingerprint | |
parent | bb9d6b906e564c9f685834bb7dcccfbe0aa87a29 (diff) | |
parent | 12ee807c1fbef73d9a05cff523d797748d209002 (diff) | |
download | packages_apps_Settings-92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3.zip packages_apps_Settings-92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3.tar.gz packages_apps_Settings-92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3.tar.bz2 |
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
Diffstat (limited to 'src/com/android/settings/fingerprint')
-rw-r--r-- | src/com/android/settings/fingerprint/FingerprintSettings.java | 58 |
1 files changed, 52 insertions, 6 deletions
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index f065bff..d40dc50 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -63,7 +63,6 @@ import com.android.settings.HelpUtils; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SubSettings; -import com.android.settings.search.Indexable; import java.util.List; @@ -569,11 +568,7 @@ public class FingerprintSettings extends SubSettings { new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId()); - FingerprintSettingsFragment parent - = (FingerprintSettingsFragment) getTargetFragment(); - parent.deleteFingerPrint(mFp); - dialog.dismiss(); + onDeleteClick(dialog); } }) .create(); @@ -599,6 +594,24 @@ public class FingerprintSettings extends SubSettings { return alertDialog; } + private void onDeleteClick(DialogInterface dialog) { + if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId()); + FingerprintSettingsFragment parent + = (FingerprintSettingsFragment) getTargetFragment(); + if (parent.mFingerprintManager.getEnrolledFingerprints().size() > 1) { + parent.deleteFingerPrint(mFp); + } else { + ConfirmLastDeleteDialog lastDeleteDialog = new ConfirmLastDeleteDialog(); + Bundle args = new Bundle(); + args.putParcelable("fingerprint", mFp); + lastDeleteDialog.setArguments(args); + lastDeleteDialog.setTargetFragment(getTargetFragment(), 0); + lastDeleteDialog.show(getFragmentManager(), + ConfirmLastDeleteDialog.class.getName()); + } + dialog.dismiss(); + } + @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); @@ -610,6 +623,39 @@ public class FingerprintSettings extends SubSettings { } } } + + public static class ConfirmLastDeleteDialog extends DialogFragment { + + private Fingerprint mFp; + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + mFp = getArguments().getParcelable("fingerprint"); + final AlertDialog alertDialog = new AlertDialog.Builder(getActivity()) + .setTitle(R.string.fingerprint_last_delete_title) + .setMessage(R.string.fingerprint_last_delete_message) + .setPositiveButton(R.string.fingerprint_last_delete_confirm, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + FingerprintSettingsFragment parent + = (FingerprintSettingsFragment) getTargetFragment(); + parent.deleteFingerPrint(mFp); + dialog.dismiss(); + } + }) + .setNegativeButton( + R.string.cancel, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }) + .create(); + return alertDialog; + } + } } public static class FingerprintPreference extends Preference { |