diff options
author | Zach Lee <leezach@google.com> | 2024-05-07 17:22:32 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-07 17:22:32 +0000 |
commit | 2c11b9ff46ec41ace534b6b71fa878ce3262ebf7 (patch) | |
tree | dd5b6f41357933c528191b472eec2ad1de2a36af | |
parent | 7e24581cd9c5ab739651ab8d434eddd22255a109 (diff) | |
parent | 52098a139dd03271bef5a930470a4defe5d84daf (diff) | |
download | base-2c11b9ff46ec41ace534b6b71fa878ce3262ebf7.tar.gz |
Merge "Fixed graphical glitch in lockpattern view" into main
-rw-r--r-- | core/java/com/android/internal/widget/LockPatternView.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 66b0158fbd67..0734e6827d4d 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -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)); |