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

Commit f003a0ba authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "PIN view - Fix multiple ripples" into sc-dev am: 6aa114f8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I524aa40a423bfaf85687801759dddff6f6dc026e
parents 10146769 6aa114f8

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

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ public class NumPadButton extends AlphaOptimizedImageButton { 


    @Override

    public boolean onTouchEvent(MotionEvent event) {

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

            if (mAnimator != null) mAnimator.start();

        }

        return super.onTouchEvent(event);

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -160,9 +160,8 @@ public class NumPadKey extends ViewGroup { 
    public boolean onTouchEvent(MotionEvent event) {

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

            doHapticKeyClick();

        }



            if (mAnimator != null) mAnimator.start();

        }



        return super.onTouchEvent(event);

    }