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

Commit 5f968cbf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make sure keep dot activated setting is not enabled when we are in stealth mode." into main

parents 0050ed80 bc0c5465

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

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ public class KeyguardPatternView extends KeyguardInputView 
                            R.dimen.keyguard_pattern_activated_dot_size));

            mLockPatternView.setPathWidth(

                    getResources().getDimensionPixelSize(R.dimen.keyguard_pattern_stroke_width));

            mLockPatternView.setKeepDotActivated(true);

        }



        mEcaView = findViewById(R.id.keyguard_selector_fade_container);

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

+7 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.internal.widget.LockPatternView.Cell; 
import com.android.internal.widget.LockscreenCredential;

import com.android.keyguard.EmergencyButtonController.EmergencyButtonCallback;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.Flags;

import com.android.systemui.bouncer.ui.helper.BouncerHapticPlayer;

import com.android.systemui.classifier.FalsingClassifier;

import com.android.systemui.classifier.FalsingCollector;
@@ -237,8 +238,12 @@ public class KeyguardPatternViewController 
        super.onViewAttached();

        mLockPatternView.setOnPatternListener(new UnlockPatternListener());

        mLockPatternView.setSaveEnabled(false);

        mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(

                mSelectedUserInteractor.getSelectedUserId()));

        boolean visiblePatternEnabled = mLockPatternUtils.isVisiblePatternEnabled(

                mSelectedUserInteractor.getSelectedUserId());

        mLockPatternView.setInStealthMode(!visiblePatternEnabled);

        if (Flags.bouncerUiRevamp2()) {

            mLockPatternView.setKeepDotActivated(visiblePatternEnabled);

        }

        mLockPatternView.setOnTouchListener((v, event) -> {

            if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {

                mFalsingCollector.avoidGesture();