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 | 6d73e4574907809bf328f1535cd88d7ec564804b (patch) | |
| tree | 9e16064bf24a19e7c10df91bd30b9684939a3759 /src/com/android/camera | |
| parent | b341bb5ddda66c8df047cb5a7ad7a2f6bb9b2991 (diff) | |
| parent | 0233bade51dfcce5fa1f49b5c2e200a719feab22 (diff) | |
| download | android_packages_apps_Snap-6d73e4574907809bf328f1535cd88d7ec564804b.tar.gz android_packages_apps_Snap-6d73e4574907809bf328f1535cd88d7ec564804b.tar.bz2 android_packages_apps_Snap-6d73e4574907809bf328f1535cd88d7ec564804b.zip | |
Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera')
| -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; |