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

Commit 2cc3ec71 authored by Zach Lee's avatar Zach Lee Committed by Automerger Merge Worker
Browse files

Merge "Fixed graphical glitch in lockpattern view" into main am: 2c11b9ff 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3075785



Change-Id: Iceaaa7a70718fc0d7236102e5baa7fd5572b9645
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96a71a86 2c11b9ff

core/java/com/android/internal/widget/LockPatternView.java

+8 −1
Original line number Diff line number Diff line
@@ -886,9 +886,16 @@ public class LockPatternView extends View { 
            cellState.activationAnimator.cancel();

        }

        AnimatorSet animatorSet = new AnimatorSet();



        // When running the line end animation (see doc for createLineEndAnimation), if cell is in:

        // - activate state - use finger position at the time of hit detection

        // - deactivate state - use current position where the end was last during initial animation

        // Note that deactivate state will only come if mKeepDotActivated is themed true.

        final float startX = activate == CELL_ACTIVATE ? mInProgressX : cellState.lineEndX;

        final float startY = activate == CELL_ACTIVATE ? mInProgressY : cellState.lineEndY;

        AnimatorSet.Builder animatorSetBuilder = animatorSet

                .play(createLineDisappearingAnimation())

                .with(createLineEndAnimation(cellState, mInProgressX, mInProgressY,

                .with(createLineEndAnimation(cellState, startX, startY,

                        getCenterXForColumn(cell.column), getCenterYForRow(cell.row)));

        if (mDotSize != mDotSizeActivated) {

            animatorSetBuilder.with(createDotRadiusAnimation(cellState));