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

Commit de626287 authored by Danny Baumann's avatar Danny Baumann Committed by Clark Scheff
Browse files

Revert "Don't allow deleting last remaining fingerprint" 

This reverts commit bee2fddc.

Not allowing that is both confusing to the user and inconsistent:
0 enrolled fingerprints (and thus fingerprint authentication being
not used despite it being enabled) is the state right after enabling
fingerprint authentication, thus it seems misguided to prevent the
user from returning to that state.

Change-Id: I1d4b5dd9d55f17f086017503f5d79ebcd8b15d24
parent 89e55965

src/com/android/settings/ManageFingerprints.java

+13 −21
Original line number Diff line number Diff line
@@ -287,9 +287,7 @@ public class ManageFingerprints extends SettingsActivity { 
            mAdapter.notifyDataSetChanged();

        }

        private void showRenameDeleteDialog(Fingerprint fingerprint) {

            boolean canDelete = mAdapter.getNumFingerprints() > 1;

            DialogFragment dialogFragment =

                    RenameAndDeleteFragment.newInstance(fingerprint, canDelete);

            DialogFragment dialogFragment = RenameAndDeleteFragment.newInstance(fingerprint);

            dialogFragment.show(getChildFragmentManager(), "Rename");

        }
@@ -411,11 +409,10 @@ public class ManageFingerprints extends SettingsActivity { 
        private Fingerprint mFingerprint;

        private EditText mFingerNameEditText;



        static RenameAndDeleteFragment newInstance(Fingerprint fingerprint, boolean canDelete) {

        static RenameAndDeleteFragment newInstance(Fingerprint fingerprint) {

            RenameAndDeleteFragment fragment = new RenameAndDeleteFragment();

            Bundle args = new Bundle();

            args.putParcelable("fingerprint", fingerprint);

            args.putBoolean("canDelete", canDelete);

            fragment.setArguments(args);

            return fragment;

        }
@@ -423,14 +420,13 @@ public class ManageFingerprints extends SettingsActivity { 
        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            mFingerprint = getArguments().getParcelable("fingerprint");

            boolean canDelete = getArguments().getBoolean("canDelete");



            LayoutInflater inflater = getActivity().getLayoutInflater();

            View dialogView = inflater.inflate(R.layout.fingerprint_rename_dialog, null, false);

            mFingerNameEditText = (EditText) dialogView.findViewById(R.id.name);

            mFingerNameEditText.setText(mFingerprint.getName());



            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())

            return new AlertDialog.Builder(getActivity())

                    .setTitle(R.string.fingerprint_dialog_title_rename)

                    .setView(dialogView)

                    .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@@ -440,10 +436,8 @@ public class ManageFingerprints extends SettingsActivity { 
                            ((FingerprintListFragment) getParentFragment())

                                    .doRename(mFingerprint, name);

                        }

                    });



            if (canDelete) {

                builder.setNegativeButton(R.string.dialog_delete_title,

                    })

                    .setNegativeButton(R.string.dialog_delete_title,

                            new DialogInterface.OnClickListener() {

                        @Override

                        public void onClick(DialogInterface dialog, int which) {
@@ -451,9 +445,7 @@ public class ManageFingerprints extends SettingsActivity { 
                                    .doDelete(mFingerprint);

                        }

                    })

            }



            return builder.create();

                    .create();

        }

    }