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

Commit 27ea6f09 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes I8c2d2ccd,I9bc97666,I52783d0a into udc-qpr-dev 

* changes:
  Ensure swipe down works for bouncer to dismiss
  Do not refetch pin length
  Ensure that disappear animation callback is run.
parents 2f972251 3bb092b4

packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java

+18 −23
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ public class KeyguardPinViewController 
    private long mPinLength;



    private boolean mDisabledAutoConfirmation;

    /**

     * Responsible for identifying if PIN hinting is to be enabled or not

     */

    private boolean mIsPinHinting;



    /**

     * Responsible for identifying if auto confirm is enabled or not in Settings

     */

    private boolean mIsAutoPinConfirmEnabledInSettings;



    protected KeyguardPinViewController(KeyguardPINView view,

            KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -63,6 +72,9 @@ public class KeyguardPinViewController 
        mFeatureFlags = featureFlags;

        mBackspaceKey = view.findViewById(R.id.delete_button);

        mPinLength = mLockPatternUtils.getPinLength(KeyguardUpdateMonitor.getCurrentUser());

        mIsPinHinting = mPinLength == DEFAULT_PIN_LENGTH;

        mIsAutoPinConfirmEnabledInSettings = mLockPatternUtils.isAutoPinConfirmEnabled(

                KeyguardUpdateMonitor.getCurrentUser());

    }



    @Override
@@ -82,7 +94,7 @@ public class KeyguardPinViewController 


    protected void onUserInput() {

        super.onUserInput();

        if (isAutoPinConfirmEnabledInSettings()) {

        if (mIsAutoPinConfirmEnabledInSettings) {

            updateAutoConfirmationState();

            if (mPasswordEntry.getText().length() == mPinLength

                    && mOkButton.getVisibility() == View.INVISIBLE) {
@@ -130,7 +142,7 @@ public class KeyguardPinViewController 
     * Updates the visibility of the OK button for auto confirm feature

     */

    private void updateOKButtonVisibility() {

        if (isAutoPinConfirmEnabledInSettings() && !mDisabledAutoConfirmation) {

        if (mIsPinHinting && !mDisabledAutoConfirmation) {

            mOkButton.setVisibility(View.INVISIBLE);

        } else {

            mOkButton.setVisibility(View.VISIBLE);
@@ -142,10 +154,9 @@ public class KeyguardPinViewController 
     * Visibility changes are only for auto confirmation configuration.

     */

    private void updateBackSpaceVisibility() {

        boolean isAutoConfirmation = isAutoPinConfirmEnabledInSettings();

        mBackspaceKey.setTransparentMode(/* isTransparentMode= */

                isAutoConfirmation && !mDisabledAutoConfirmation);

        if (isAutoConfirmation) {

                mIsAutoPinConfirmEnabledInSettings && !mDisabledAutoConfirmation);

        if (mIsAutoPinConfirmEnabledInSettings) {

            if (mPasswordEntry.getText().length() > 0

                    || mDisabledAutoConfirmation) {

                mBackspaceKey.setVisibility(View.VISIBLE);
@@ -155,24 +166,8 @@ public class KeyguardPinViewController 
        }

    }

    /** Updates whether to use pin hinting or not. */

    void updatePinHinting() {

        mPasswordEntry.setIsPinHinting(isAutoPinConfirmEnabledInSettings() && isPinHinting()

    private void updatePinHinting() {

        mPasswordEntry.setIsPinHinting(mIsAutoPinConfirmEnabledInSettings && mIsPinHinting

                && !mDisabledAutoConfirmation);

    }



    /**

     * Responsible for identifying if PIN hinting is to be enabled or not

     */

    private boolean isPinHinting() {

        return mLockPatternUtils.getPinLength(KeyguardUpdateMonitor.getCurrentUser())

                == DEFAULT_PIN_LENGTH;

    }



    /**

     * Responsible for identifying if auto confirm is enabled or not in Settings

     */

    private boolean isAutoPinConfirmEnabledInSettings() {

        //Checks if user has enabled the auto confirm in Settings

        return mLockPatternUtils.isAutoPinConfirmEnabled(KeyguardUpdateMonitor.getCurrentUser());

    }

}

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+7 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 


    public interface SwipeListener {

        void onSwipeUp();

        /** */

        void onSwipeDown();

    }



    @VisibleForTesting
@@ -543,6 +545,11 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                if (mSwipeListener != null) {

                    mSwipeListener.onSwipeUp();

                }

            } else if (getTranslationY() > TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                    MIN_DRAG_SIZE, getResources().getDisplayMetrics())) {

                if (mSwipeListener != null) {

                    mSwipeListener.onSwipeDown();

                }

            }

        }

        return true;

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+6 −1
Original line number Diff line number Diff line
@@ -70,11 +70,11 @@ import com.android.systemui.Gefingerpoken; 
import com.android.systemui.R;

import com.android.systemui.biometrics.SideFpsController;

import com.android.systemui.biometrics.SideFpsUiRequestSource;

import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor;

import com.android.systemui.classifier.FalsingA11yDelegate;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.ActivityStarter;
@@ -319,6 +319,11 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                        "swipeUpOnBouncer");

            }

        }



        @Override

        public void onSwipeDown() {

            mViewMediatorCallback.onBouncerSwipeDown();

        }

    };

    private final ConfigurationController.ConfigurationListener mConfigurationListener =

            new ConfigurationController.ConfigurationListener() {

packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java

+5 −0
Original line number Diff line number Diff line
@@ -104,4 +104,9 @@ public interface ViewMediatorCallback { 
     * Call when cancel button is pressed in bouncer.

     */

    void onCancelClicked();



    /**

     * Determines if bouncer has swiped down.

     */

    void onBouncerSwipeDown();

}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −0
Original line number Diff line number Diff line
@@ -834,6 +834,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
            mKeyguardViewControllerLazy.get().onCancelClicked();

        }



        @Override

        public void onBouncerSwipeDown() {

            mKeyguardViewControllerLazy.get().reset(/* hideBouncerWhenShowing= */ true);

        }



        @Override

        public void playTrustedSound() {

            KeyguardViewMediator.this.playTrustedSound();