summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-04-19 12:34:43 -0700
committerSunny Goyal <sunnygoyal@google.com>2018-04-20 20:53:16 +0000
commited2d2bcbb8541eb811615638e6bcf93524c2b333 (patch)
treeae4e24acfe267fd1cdaf6019fd48852d2c73698a /src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
parent69632a46ab975e5410a098425c54d7d39cdc5d16 (diff)
downloadandroid_packages_apps_Trebuchet-ed2d2bcbb8541eb811615638e6bcf93524c2b333.tar.gz
android_packages_apps_Trebuchet-ed2d2bcbb8541eb811615638e6bcf93524c2b333.tar.bz2
android_packages_apps_Trebuchet-ed2d2bcbb8541eb811615638e6bcf93524c2b333.zip
Force finish any pending animations if the insets or orientation change
Some animation might be running from a previous orientation, which can cuase property changes to get skipped. Bug: 77848165 Bug: 77774619 Change-Id: I3e198196192746abdd72a1970ff2ef407bf4aff9
Diffstat (limited to 'src/com/android/launcher3/touch/AbstractStateChangeTouchController.java')
-rw-r--r--src/com/android/launcher3/touch/AbstractStateChangeTouchController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index f1195edf3..4c7ce1fb4 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -279,7 +279,7 @@ public abstract class AbstractStateChangeTouchController extends AnimatorListene
@Override
public void onAnimationCancel(Animator animation) {
- if (mCurrentAnimation != null && animation == mCurrentAnimation.getOriginalTarget()) {
+ if (mCurrentAnimation != null && animation == mCurrentAnimation.getTarget()) {
Log.e(TAG, "Who dare cancel the animation when I am in control", new Exception());
clearState();
}