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

Commit 468e6b7e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

am b9e290c7: Cancel ripple animations when window is hidden 

automerge: 987c6809

* commit '987c6809':
  Cancel ripple animations when window is hidden
parents 298c170a 987c6809

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

+5 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ public class KeyButtonRipple extends Drawable { 
        }

    }





    @Override

    public void draw(Canvas canvas) {

        mSupportHardware = canvas.isHardwareAccelerated();
@@ -175,6 +174,11 @@ public class KeyButtonRipple extends Drawable { 
        }

    }



    @Override

    public void jumpToCurrentState() {

        cancelAnimations();

    }



    @Override

    public boolean isStateful() {

        return true;

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

+8 −11
Original line number Diff line number Diff line
@@ -17,38 +17,27 @@ 
package com.android.systemui.statusbar.policy;



import android.animation.Animator;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.TimeInterpolator;

import android.app.ActivityManager;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.CanvasProperty;

import android.graphics.Paint;

import android.graphics.RectF;

import android.hardware.input.InputManager;

import android.media.AudioManager;

import android.os.Bundle;

import android.os.SystemClock;

import android.util.AttributeSet;

import android.util.Log;

import android.util.MathUtils;

import android.view.HapticFeedbackConstants;

import android.view.HardwareCanvas;

import android.view.InputDevice;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.RenderNodeAnimator;

import android.view.SoundEffectConstants;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.ImageView;

import java.lang.Math;

import java.util.ArrayList;



import com.android.systemui.R;
@@ -123,6 +112,14 @@ public class KeyButtonView extends ImageView { 
        }

    }



    @Override

    protected void onWindowVisibilityChanged(int visibility) {

        super.onWindowVisibilityChanged(visibility);

        if (visibility != View.VISIBLE) {

            jumpDrawablesToCurrentState();

        }

    }



    @Override

    public boolean performAccessibilityAction(int action, Bundle arguments) {

        if (action == ACTION_CLICK && mCode != 0) {