commit c83245be678608533ce53005f4149719f6dd5e03
author Alan Viverette <alanv@google.com> Thu Jan 15 01:39:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 15 01:39:44 2015 +0000
tree 4aa223cf6bab71e5ed7d686b64875c0ac01fe2d5
parent da562f3d514fbf52059c5d981d6db366bd4c5927
parent 628e646eeae6147578428632d7c25326b8b7ef59

am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev

* commit '628e646eeae6147578428632d7c25326b8b7ef59':
  Jump ripples to end when switching to a non-hardware canvas

graphics/java/android/graphics/drawable/Ripple.java

diff --git a/graphics/java/android/graphics/drawable/Ripple.java b/graphics/java/android/graphics/drawable/Ripple.java
index ba1e86c..bb1d3cb 100644
--- a/graphics/java/android/graphics/drawable/Ripple.java
+++ b/graphics/java/android/graphics/drawable/Ripple.java
@@ -214,7 +214,7 @@
         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;
 

graphics/java/android/graphics/drawable/RippleBackground.java

diff --git a/graphics/java/android/graphics/drawable/RippleBackground.java b/graphics/java/android/graphics/drawable/RippleBackground.java
index cc42aac..fae4902 100644
--- a/graphics/java/android/graphics/drawable/RippleBackground.java
+++ b/graphics/java/android/graphics/drawable/RippleBackground.java
@@ -148,7 +148,7 @@
         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;