summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/PieRenderer.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-24 14:49:46 -0700
committerMichael Kolb <kolby@google.com>2013-04-24 14:49:46 -0700
commit0233bade51dfcce5fa1f49b5c2e200a719feab22 (patch)
tree2f8258b23f7b2d627aaa0d8053dd6a94f05e16b0 /src/com/android/camera/ui/PieRenderer.java
parentf9ff7ffe2004ed2077f38a91dafb213495e5bf70 (diff)
downloadandroid_packages_apps_Snap-0233bade51dfcce5fa1f49b5c2e200a719feab22.tar.gz
android_packages_apps_Snap-0233bade51dfcce5fa1f49b5c2e200a719feab22.tar.bz2
android_packages_apps_Snap-0233bade51dfcce5fa1f49b5c2e200a719feab22.zip
Reset ongoing animation when opening menu
Bug: 8687199 The XFade animation was not reset and yielded a transparent alpha Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967
Diffstat (limited to 'src/com/android/camera/ui/PieRenderer.java')
-rw-r--r--src/com/android/camera/ui/PieRenderer.java3
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;