diff options
| author | 2015-01-15 01:05:53 +0000 | |
|---|---|---|
| committer | 2015-01-15 01:05:53 +0000 | |
| commit | aa229902ef73f8777768414092eaf99eeff05f87 (patch) | |
| tree | e2993ddcbbdaf365674dc9180c765d0970238a6f | |
| parent | 4490774bc10d575ce1da3ea98ef3e6bc1f37fed2 (diff) | |
| parent | a0c0ca738989fd3ecad8a54a91f0c6a8b30ad1ab (diff) | |
Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev
| -rw-r--r-- | graphics/java/android/graphics/drawable/Ripple.java | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleBackground.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/Ripple.java b/graphics/java/android/graphics/drawable/Ripple.java index ba1e86c6f5a3..bb1d3cb4e6ee 100644 --- a/graphics/java/android/graphics/drawable/Ripple.java +++ b/graphics/java/android/graphics/drawable/Ripple.java @@ -214,7 +214,7 @@ class Ripple { final boolean canUseHardware = c.isHardwareAccelerated(); if (mCanUseHardware != canUseHardware && mCanUseHardware) { // We've switched from hardware to non-hardware mode. Panic. - cancelHardwareAnimations(false); + cancelHardwareAnimations(true); } mCanUseHardware = canUseHardware; diff --git a/graphics/java/android/graphics/drawable/RippleBackground.java b/graphics/java/android/graphics/drawable/RippleBackground.java index cc42aacf4266..fae4902d1d3d 100644 --- a/graphics/java/android/graphics/drawable/RippleBackground.java +++ b/graphics/java/android/graphics/drawable/RippleBackground.java @@ -148,7 +148,7 @@ class RippleBackground { final boolean canUseHardware = c.isHardwareAccelerated(); if (mCanUseHardware != canUseHardware && mCanUseHardware) { // We've switched from hardware to non-hardware mode. Panic. - cancelHardwareAnimations(false); + cancelHardwareAnimations(true); } mCanUseHardware = canUseHardware; |