Merge "Fix the mode picker animation position and speed in landscape." into jb-dev

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/camera/ModePicker.java b/src/com/android/camera/ModePicker.java
index a785c9d9..003f94c7 100644
--- a/src/com/android/camera/ModePicker.java
+++ b/src/com/android/camera/ModePicker.java
@@ -127,7 +127,7 @@ public class ModePicker extends RelativeLayout implements View.OnClickListener,
                 // It looks weird so fade-in animation is not used here.
                 mCurrentModeFrame.setVisibility(View.VISIBLE);
             } else {
-                Util.fadeIn(mCurrentModeFrame, 0.3F, 1F, 400);
+                Util.fadeIn(mCurrentModeFrame, 0.3F, 1F, 100);
             }
             mModeSelectionFrame.setVisibility(View.GONE);
             changeToSelectedMode();
@@ -145,10 +145,15 @@ public class ModePicker extends RelativeLayout implements View.OnClickListener,
     private void enableModeSelection(boolean enabled) {
         if (mCurrentModeFrame != null) {
             mSelectionEnabled = enabled;
-            // Animation Effect is applied on Phone UI only.
+            // Animation is applied on Phone UI only.
+            mModeSelectionFrame.clearAnimation();
             mModeSelectionFrame.startAnimation(enabled ? mFadeIn : mFadeOut);
             if (enabled) {
                 mModeSelectionFrame.setVisibility(View.VISIBLE);
+                // Make sure the animation is stopped. It looks like the view
+                // will still be drawn during animation even though the
+                // visibility has been set to gone.
+                mCurrentModeFrame.clearAnimation();
                 mCurrentModeFrame.setVisibility(View.GONE);
             }
         }