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

Commit 9937a513 authored by Vincent Wang's avatar Vincent Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix Delete face model button flicker"

parents de6ed695 65f53e98

src/com/android/settings/biometrics/face/FaceSettings.java

+8 −4
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@ public class FaceSettings extends DashboardFragment { 
        if (savedInstanceState != null) {

            mToken = savedInstanceState.getByteArray(KEY_TOKEN);

        }



        final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);

        mEnrollButton.setVisible(!hasEnrolled);

        mRemoveButton.setVisible(hasEnrolled);

    }



    @Override
@@ -230,10 +234,6 @@ public class FaceSettings extends DashboardFragment { 
            mEnrollController.setToken(mToken);

        }



        final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);

        mEnrollButton.setVisible(!hasEnrolled);

        mRemoveButton.setVisible(hasEnrolled);



        if (!mFaceFeatureProvider.isAttentionSupported(getContext())) {

            removePreference(FaceSettingsAttentionPreferenceController.KEY);

        }
@@ -261,6 +261,10 @@ public class FaceSettings extends DashboardFragment { 
                    mEnrollController.setToken(mToken);

                    mConfirmingPassword = false;

                });



                final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);

                mEnrollButton.setVisible(!hasEnrolled);

                mRemoveButton.setVisible(hasEnrolled);

            }

        } else if (requestCode == ENROLL_REQUEST) {

            if (resultCode == RESULT_TIMEOUT) {