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

Commit 40e0f243 authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

Merge "Unbreak CC screen"

parents 8bcac046 59f5976e

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -90,11 +90,11 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
    public void onAuthenticated() {

        // Check whether we are still active.

        if (getActivity() != null && getActivity().isResumed()) {

            authenticationSucceeded(null /* password */);

            authenticationSucceeded();

        }

    }



    protected abstract void authenticationSucceeded(@Nullable String password);

    protected abstract void authenticationSucceeded();



    @Override

    public void onFingerprintIconVisibilityChanged(boolean visible) {

src/com/android/settings/ConfirmLockPassword.java

+4 −2
Original line number Diff line number Diff line
@@ -169,8 +169,10 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
        }



        @Override

        protected void authenticationSucceeded(@Nullable String password) {

            // TODO: make this play nice with challenge

        protected void authenticationSucceeded() {

            Intent intent = new Intent();

            getActivity().setResult(RESULT_OK, intent);

            getActivity().finish();

        }



        private void handleNext() {

src/com/android/settings/ConfirmLockPattern.java

+4 −2
Original line number Diff line number Diff line
@@ -232,8 +232,10 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
        }



        @Override

        protected void authenticationSucceeded(@Nullable String password) {

            // TODO: make this play nice with challenge

        protected void authenticationSucceeded() {

            Intent intent = new Intent();

            getActivity().setResult(Activity.RESULT_OK, intent);

            getActivity().finish();

        }



        @Override