Merge "Show menu for longer" into gb-ub-photos-arches

2 files changed, 6 insertions, 5 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 0574081b..3a9da076 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -552,6 +552,9 @@ public class PhotoModule
         initializeZoom();
         updateOnScreenIndicators();
         showTapToFocusToastIfNeeded();
+        if (mPieRenderer != null) {
+            mPieRenderer.showFade();
+        }
     }
 
     private void initializePhotoControl() {
@@ -1712,9 +1715,6 @@ public class PhotoModule
         PopupManager.getInstance(mActivity).notifyShowPopup(null);
 
         mSoundPlayer = SoundClips.getPlayer(mActivity);
-        if (mPieRenderer != null) {
-            mPieRenderer.showFade();
-        }
     }
 
     void waitCameraStartUpThread() {
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 4258f606..dd07d6a6 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -28,7 +28,6 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Animation;
@@ -46,6 +45,7 @@ public class PieRenderer extends OverlayRenderer
 
     private static final String TAG = "CAM Pie";
 
+    private static final long PIE_FADE_DURATION = 1500;
     // Sometimes continuous autofocus starts and stops several times quickly.
     // These states are used to make sure the animation is run for at least some
     // time.
@@ -236,7 +236,7 @@ public class PieRenderer extends OverlayRenderer
             }
         });
         anim.reset();
-        anim.setDuration(1000);
+        anim.setDuration(PIE_FADE_DURATION);
         show(true);
         mOverlay.startAnimation(anim);
     }
@@ -700,6 +700,7 @@ public class PieRenderer extends OverlayRenderer
 
     @Override
     public void clear() {
+        if (mState == STATE_PIE) return;
         mAnimation.cancel();
         mFocused = false;
         mFocusFromTap = false;