Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b9e290c7: Cancel ripple animations when window is hidden

Browse Source 
* commit 'b9e290c7136fb7c76b7238426ccd598dec2d2643':
  Cancel ripple animations when window is hidden
This commit is contained in:
Jorim Jaggi
2014-10-29 22:49:33 +00:00
committed by Android Git Automerger
parent 9917ebed86 b9e290c713
commit 987c68090c
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,6 @@ public class KeyButtonRipple extends Drawable {
} }
} }
@Override @Override
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
mSupportHardware = canvas.isHardwareAccelerated(); mSupportHardware = canvas.isHardwareAccelerated();
@@ -175,6 +174,11 @@ public class KeyButtonRipple extends Drawable {
} }
} }
@Override
public void jumpToCurrentState() {
cancelAnimations();
}
@Override @Override
public boolean isStateful() { public boolean isStateful() {
return true; return true;

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

@@ -17,38 +17,27 @@
package com.android.systemui.statusbar.policy; package com.android.systemui.statusbar.policy;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; 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.hardware.input.InputManager;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.util.MathUtils;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.HardwareCanvas;
import android.view.InputDevice; import android.view.InputDevice;
import android.view.KeyCharacterMap; import android.view.KeyCharacterMap;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.RenderNodeAnimator;
import android.view.SoundEffectConstants; import android.view.SoundEffectConstants;
import android.view.View; import android.view.View;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.ImageView; import android.widget.ImageView;
import java.lang.Math;
import java.util.ArrayList;
import com.android.systemui.R; 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 @Override
public boolean performAccessibilityAction(int action, Bundle arguments) { public boolean performAccessibilityAction(int action, Bundle arguments) {
if (action == ACTION_CLICK && mCode != 0) { if (action == ACTION_CLICK && mCode != 0) {