From c3b68dff1654f95a9512027b29e8da49a15f4194 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 4 Jun 2015 15:33:52 -0700
Subject: [PATCH] Manually jump ripples when preemptively aborting RT animation

Bug: 21079749
Change-Id: If79dcef59aba616c0446efc623863f563cb16250
---
 graphics/java/android/graphics/drawable/RippleComponent.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/graphics/java/android/graphics/drawable/RippleComponent.java b/graphics/java/android/graphics/drawable/RippleComponent.java
index aa2aa207be143..23a3ee3f94371 100644
--- a/graphics/java/android/graphics/drawable/RippleComponent.java
+++ b/graphics/java/android/graphics/drawable/RippleComponent.java
@@ -233,6 +233,10 @@ abstract class RippleComponent {
 
         if (mHasPendingHardwareAnimator) {
             mHasPendingHardwareAnimator = false;
+
+            // Manually jump values to their exited state. Normally we'd do that
+            // later when starting the hardware exit, but we're aborting early.
+            jumpValuesToExit();
         }
     }