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

Commit 06ffb88d authored by Altaf-Mahdi's avatar Altaf-Mahdi Committed by Steve Kondik
Browse files

Revert "SystemUI: fix nav button ripple getting stuck" 

This reverts commit 19040260.

Change-Id: I839c3cbbcbbe6bef11e099c62e6e5cc60320c41d
parent 117a99e4

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public class KeyButtonRipple extends Drawable { 
        mRunningAnimations.add(scaleAnimator);

    }



    /* package */ void exitSoftware() {

    private void exitSoftware() {

        ObjectAnimator alphaAnimator = ObjectAnimator.ofFloat(this, "glowAlpha", mGlowAlpha, 0f);

        alphaAnimator.setInterpolator(mAlphaExitInterpolator);

        alphaAnimator.setDuration(ANIMATION_DURATION_FADE);

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+1 −5
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public class KeyButtonView extends ImageView { 
    private boolean mInEditMode;

    private AudioManager mAudioManager;

    private Animator mAnimateToQuiescent = new ObjectAnimator();

    private KeyButtonRipple mRipple;



    private PowerManager mPm;

    private boolean mPerformedLongClick;
@@ -116,7 +115,7 @@ public class KeyButtonView extends ImageView { 
        setClickable(true);

        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();

        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

        setBackground(mRipple = new KeyButtonRipple(context, this));

        setBackground(new KeyButtonRipple(context, this));

        mPm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);

    }
@@ -274,9 +273,6 @@ public class KeyButtonView extends ImageView { 
                break;

            case MotionEvent.ACTION_CANCEL:

                setPressed(false);

                // hack to fix ripple getting stuck. exitHardware() starts an animation,

                // but sometimes does not finish it.

                mRipple.exitSoftware();

                if (mCode != 0) {

                    sendEvent(KeyEvent.ACTION_UP, KeyEvent.FLAG_CANCELED);

                }