diff options
author | emancebo <emancebo@cyngn.com> | 2015-02-03 12:15:11 -0800 |
---|---|---|
committer | Ed Mancebo <emancebo@cyngn.com> | 2015-02-03 21:22:48 +0000 |
commit | 7b54a22a9ecc15ae3c5364ebd14721cb5f474992 (patch) | |
tree | 6319743dbd772c0e9dd933d6155652b5d70f66f1 /src/com/android | |
parent | edbea0af1226978b06d7f877ae435797d31419af (diff) | |
download | android_packages_apps_Trebuchet-7b54a22a9ecc15ae3c5364ebd14721cb5f474992.tar.gz android_packages_apps_Trebuchet-7b54a22a9ecc15ae3c5364ebd14721cb5f474992.tar.bz2 android_packages_apps_Trebuchet-7b54a22a9ecc15ae3c5364ebd14721cb5f474992.zip |
Trebuchet: ensure preview animation is released after exiting TransitionEffectsFragment
Change-Id: Id6253a6162ee47dd1a46886026f09c3adbdc7027
(cherry picked from commit a426812f58b320c191ed8427d145966724949d67)
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/TransitionEffectsFragment.java | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 937a167d1..3657093c2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1359,6 +1359,7 @@ public class Launcher extends Activity } fragmentTransaction .remove(mTransitionEffectsFragment).commit(); + mTransitionEffectsFragment = null; mDarkPanel.setVisibility(View.VISIBLE); ObjectAnimator anim = ObjectAnimator.ofFloat( diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java index d490a0034..5fb5d22b7 100644 --- a/src/com/android/launcher3/TransitionEffectsFragment.java +++ b/src/com/android/launcher3/TransitionEffectsFragment.java @@ -153,6 +153,18 @@ public class TransitionEffectsFragment extends Fragment { frameAnimation.start(); } + @Override + public void onStop() { + super.onStop(); + + // explicitly stop animation to ensure that we release references from the + // view root's run queue + AnimationDrawable frameAnimation = (AnimationDrawable) mTransitionIcon.getBackground(); + if (frameAnimation != null) { + frameAnimation.stop(); + } + } + private void setSelected(View v) { v.setBackgroundColor(Color.WHITE); TextView t = (TextView) v.findViewById(R.id.item_name); |