Fix for Capture Indicator Animation Listeners

Issue arose when Capture Indicator was hidden from the screen, and
animations were NOT finished.   Current listeners were unregistered,
but never re-registered when capture indicator was shown again.
Simplest solution is to null out the references to the animators in
the RoundThumbnailView to signal animators to be re-created.

Bug: 19034435
Change-Id: I94b74c0ea8f385d348dd981ebe8d9402140c3248

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/camera/widget/RoundedThumbnailView.java b/src/com/android/camera/widget/RoundedThumbnailView.java
index d6a02f875..8629c453a 100644
--- a/src/com/android/camera/widget/RoundedThumbnailView.java
+++ b/src/com/android/camera/widget/RoundedThumbnailView.java
@@ -456,10 +456,17 @@ public class RoundedThumbnailView extends View {
         if (mThumbnailAnimatorSet != null && mThumbnailAnimatorSet.isRunning()) {
             mThumbnailAnimatorSet.removeAllListeners();
             mThumbnailAnimatorSet.cancel();
+            // Release the animator so that a new instance will be created and
+            // its listeners properly reconnected.  Fix for b/19034435
+            mThumbnailAnimatorSet = null;
         }
+
         if (mRippleAnimator != null && mRippleAnimator.isRunning()) {
             mRippleAnimator.removeAllListeners();
             mRippleAnimator.cancel();
+            // Release the animator so that a new instance will be created and
+            // its listeners properly reconnected.  Fix for b/19034435
+            mRippleAnimator = null;
         }
         // Remove all pending reveal requests.
         mRevealRequestWaitQueue.clear();