PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing stateManager not correctly deduping existing animations

Browse Source 
Bug: 79251716
Change-Id: I40c3ebf0ec4d49aa1fe1948ad3d83eb87cc1c5f1
This commit is contained in:
Sunny Goyal
2018-05-04 10:09:41 -07:00
committed by Tony
parent 729020d186
commit a6616dec28
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherStateManager.java
+12 -1
View File
@@ -374,7 +374,18 @@ public class LauncherStateManager {
*/
public void setCurrentAnimation(AnimatorSet anim, Animator... childAnimations) {
for (Animator childAnim : childAnimations) {
if (childAnim != null && mConfig.mCurrentAnimation == childAnim) {
if (childAnim == null) {
continue;
}
if (mConfig.playbackController != null
&& mConfig.playbackController.getTarget() == childAnim) {
if (mConfig.mCurrentAnimation != null) {
mConfig.mCurrentAnimation.removeListener(mConfig);
mConfig.mCurrentAnimation = null;
}
mConfig.playbackController = null;
break;
} else if (mConfig.mCurrentAnimation == childAnim) {
mConfig.mCurrentAnimation.removeListener(mConfig);
mConfig.mCurrentAnimation = null;
break;