summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-06-04 15:33:52 -0700
committerAlan Viverette <alanv@google.com>2015-06-04 15:33:52 -0700
commitc3b68dff1654f95a9512027b29e8da49a15f4194 (patch)
tree3a1c4d2064e7d916bb67f8bb4f4afd66a074ae51 /graphics/java
parentb0a5e78fc06aeb67ac1f55832c9ceef5f92a0807 (diff)
downloadframeworks_base-c3b68dff1654f95a9512027b29e8da49a15f4194.zip
frameworks_base-c3b68dff1654f95a9512027b29e8da49a15f4194.tar.gz
frameworks_base-c3b68dff1654f95a9512027b29e8da49a15f4194.tar.bz2
Manually jump ripples when preemptively aborting RT animation
Bug: 21079749 Change-Id: If79dcef59aba616c0446efc623863f563cb16250
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/RippleComponent.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleComponent.java b/graphics/java/android/graphics/drawable/RippleComponent.java
index aa2aa20..23a3ee3 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();
}
}