summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-03-24 23:08:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-24 23:08:30 +0000
commit9ebb685b038b325fde76d4f81d2adb584e522f5c (patch)
tree443aa838fbda5edd3dd916794a4adf196c521d85 /packages/SystemUI
parent221d2cbf2f418be8de22f5cf3d79a25be1b8d1be (diff)
parent3040484265bf5fe9f5bc7a1974b5c78d69eba01f (diff)
downloadframeworks_base-9ebb685b038b325fde76d4f81d2adb584e522f5c.zip
frameworks_base-9ebb685b038b325fde76d4f81d2adb584e522f5c.tar.gz
frameworks_base-9ebb685b038b325fde76d4f81d2adb584e522f5c.tar.bz2
Merge "Fixing issue with floating task headers."
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java
index bba7682..a55e026 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java
@@ -132,6 +132,8 @@ public class TaskViewTransform {
/** Reset the transform on a view. */
public static void reset(View v) {
+ // Cancel any running animations
+ v.animate().cancel();
v.setTranslationX(0f);
v.setTranslationY(0f);
v.setTranslationZ(0f);