diff options
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 57fcf9092..0c09edefa 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -17,6 +17,7 @@ package com.android.camera; +import java.util.HashSet; import java.util.Locale; import android.animation.Animator; @@ -102,6 +103,7 @@ public class PhotoMenu extends MenuController private static final int ANIMATION_DURATION = 300; private int previewMenuSize; private Rect mTmpRect = new Rect(); + private HashSet<View> mWasVisibleSet = new HashSet<View>(); public PhotoMenu(CameraActivity activity, PhotoUI ui) { super(activity); @@ -1230,7 +1232,17 @@ public class PhotoMenu extends MenuController mHdrSwitcher.setVisibility(status); mSceneModeSwitcher.setVisibility(status); mFilterModeSwitcher.setVisibility(status); - mCameraSwitcher.setVisibility(status); + if(status == View.INVISIBLE) { + if(mCameraSwitcher.getVisibility() == View.VISIBLE) { + mWasVisibleSet.add(mCameraSwitcher); + } + mCameraSwitcher.setVisibility(status); + } else { + if(mWasVisibleSet.contains(mCameraSwitcher)) { + mCameraSwitcher.setVisibility(status); + mWasVisibleSet.remove(mCameraSwitcher); + } + } mPreviewThumbnail.setVisibility(status); } } |