commit 31a50d72488ec057d78dedfce290eab9264baed5
author Michael Kolb <kolby@google.com> Wed Apr 24 21:54:55 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 24 21:54:55 2013 +0000
tree 6f8ed1631541692685f974c96f69731c467eb181
parent cc7bcd0721735723c683b2f27267a52a76ff4244
parent 9366aa90973d7c5750cc0df14c750e19cc0ac899

Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce

src/com/android/camera/ui/PieRenderer.java

diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index bd3c2f7..9edc111 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -268,6 +268,9 @@
      */
     private void show(boolean show) {
         if (show) {
+            if (mXFade != null) {
+                mXFade.cancel();
+            }
             mState = STATE_PIE;
             // ensure clean state
             mCurrentItem = null;