summaryrefslogtreecommitdiffstats
path: root/src
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
commit9366aa90973d7c5750cc0df14c750e19cc0ac899 (patch)
treef91fee298d83e2f47f0718f4607f5b86e0c0e2d1 /src
parent0c71308c9d2a72d4a3faf00242707de773d5beba (diff)
downloadandroid_packages_apps_Gallery2-9366aa90973d7c5750cc0df14c750e19cc0ac899.tar.gz
android_packages_apps_Gallery2-9366aa90973d7c5750cc0df14c750e19cc0ac899.tar.bz2
android_packages_apps_Gallery2-9366aa90973d7c5750cc0df14c750e19cc0ac899.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')
-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;