From a0c0ca738989fd3ecad8a54a91f0c6a8b30ad1ab Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 14 Jan 2015 17:05:21 -0800
Subject: [PATCH] Jump ripples to end when switching to a non-hardware canvas

Previously we canceled the hardware animations but neglected to reset
the state, which left us drawing in the pressed state.

Bug: 19020524
Change-Id: I439a18126b9093cac40006361be99f8d077b95a9
---
 graphics/java/android/graphics/drawable/Ripple.java           | 2 +-
 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 ba1e86c6f5a31..bb1d3cb4e6eea 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 cc42aacf4266f..fae4902d1d3d3 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;