diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-08-07 16:09:24 -0700 |
---|---|---|
committer | Rajesh Yengisetty <rajesh@cyngn.com> | 2014-08-14 18:16:27 +0000 |
commit | 277cfe5d91b4594ba3155d0d2917b9d20b7d3684 (patch) | |
tree | 8126a77fa28e0a669669014a9a2fd77554baad93 /src/com/android/launcher3/LauncherAnimUtils.java | |
parent | cddb4bbc70ee010d5e95d7a43600ff8e6458eb4d (diff) | |
download | android_packages_apps_Trebuchet-277cfe5d91b4594ba3155d0d2917b9d20b7d3684.tar.gz android_packages_apps_Trebuchet-277cfe5d91b4594ba3155d0d2917b9d20b7d3684.tar.bz2 android_packages_apps_Trebuchet-277cfe5d91b4594ba3155d0d2917b9d20b7d3684.zip |
Fix for shadow folders.
Repro:
- Set low animation scale (.3-.5)
- Pkill Trebuchet
- Open home screen and click open folder with ~12+
https://jira.cyanogenmod.org/browse/CYAN-4907
Change-Id: Ib927101e72674d5ffa3733f5c093c3f9970fa273
Diffstat (limited to 'src/com/android/launcher3/LauncherAnimUtils.java')
-rw-r--r-- | src/com/android/launcher3/LauncherAnimUtils.java | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java index e6c220b2a..0f58e0c4e 100644 --- a/src/com/android/launcher3/LauncherAnimUtils.java +++ b/src/com/android/launcher3/LauncherAnimUtils.java @@ -103,7 +103,12 @@ public class LauncherAnimUtils { anim.setPropertyName(propertyName); anim.setFloatValues(values); cancelOnDestroyActivity(anim); - new FirstFrameAnimatorHelper(anim, target); + // If the animation scale is less than 1f the FirstFrameAnimatorHelper sometimes causes + // the animation to not finish (e.g. opening a Folder will result in the Folder View's + // alpha being stuck somewhere between 0-1f. + if (Launcher.isAnimatorScaleSafe()) { + new FirstFrameAnimatorHelper(anim, target); + } return anim; } @@ -113,7 +118,12 @@ public class LauncherAnimUtils { anim.setTarget(target); anim.setValues(values); cancelOnDestroyActivity(anim); - new FirstFrameAnimatorHelper(anim, target); + // If the animation scale is less than 1f the FirstFrameAnimatorHelper sometimes causes + // the animation to not finish (e.g. opening a Folder will result in the Folder View's + // alpha being stuck somewhere between 0-1f. + if (Launcher.isAnimatorScaleSafe()) { + new FirstFrameAnimatorHelper(anim, target); + } return anim; } @@ -123,7 +133,12 @@ public class LauncherAnimUtils { anim.setTarget(target); anim.setValues(values); cancelOnDestroyActivity(anim); - new FirstFrameAnimatorHelper(anim, view); + // If the animation scale is less than 1f the FirstFrameAnimatorHelper sometimes causes + // the animation to not finish (e.g. opening a Folder will result in the Folder View's + // alpha being stuck somewhere between 0-1f. + if (Launcher.isAnimatorScaleSafe()) { + new FirstFrameAnimatorHelper(anim, view); + } return anim; } } |