diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-24 21:54:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-24 21:54:55 +0000 |
| commit | 31a50d72488ec057d78dedfce290eab9264baed5 (patch) | |
| tree | 6f8ed1631541692685f974c96f69731c467eb181 | |
| parent | cc7bcd0721735723c683b2f27267a52a76ff4244 (diff) | |
| parent | 9366aa90973d7c5750cc0df14c750e19cc0ac899 (diff) | |
| download | android_packages_apps_Gallery2-31a50d72488ec057d78dedfce290eab9264baed5.tar.gz android_packages_apps_Gallery2-31a50d72488ec057d78dedfce290eab9264baed5.tar.bz2 android_packages_apps_Gallery2-31a50d72488ec057d78dedfce290eab9264baed5.zip | |
Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/ui/PieRenderer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java index bd3c2f76a..9edc11182 100644 --- a/src/com/android/camera/ui/PieRenderer.java +++ b/src/com/android/camera/ui/PieRenderer.java @@ -268,6 +268,9 @@ public class PieRenderer extends OverlayRenderer */ private void show(boolean show) { if (show) { + if (mXFade != null) { + mXFade.cancel(); + } mState = STATE_PIE; // ensure clean state mCurrentItem = null; |