From d5f2cd6ed70d65424763d726d4c65ebcecd5593f Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Thu, 25 Feb 2021 10:41:54 -0500 Subject: [PATCH] PIN view - Fix multiple ripples Only apply animation on DOWN motion Fixes: 180994829 Test: manual Change-Id: Ifdb6e6319e063d577aecdf84dcb7197bd5c725d3 --- packages/SystemUI/src/com/android/keyguard/NumPadButton.java | 4 +++- packages/SystemUI/src/com/android/keyguard/NumPadKey.java | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java index 8cb1bc4878a5c..5db3349b646a6 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java @@ -69,7 +69,9 @@ public class NumPadButton extends AlphaOptimizedImageButton { @Override public boolean onTouchEvent(MotionEvent event) { - if (mAnimator != null) mAnimator.start(); + if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { + if (mAnimator != null) mAnimator.start(); + } return super.onTouchEvent(event); } diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java index a4a781dc6ff50..e6a9d4fdd5471 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java @@ -160,10 +160,9 @@ public class NumPadKey extends ViewGroup { public boolean onTouchEvent(MotionEvent event) { if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { doHapticKeyClick(); + if (mAnimator != null) mAnimator.start(); } - if (mAnimator != null) mAnimator.start(); - return super.onTouchEvent(event); }