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 225a8fe05..4ccb78177 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -16,6 +16,7 @@ package com.android.camera; +import java.util.HashSet; import java.util.Locale; import android.animation.Animator; @@ -116,6 +117,7 @@ public class PhotoMenu extends MenuController private MakeupLevelListener mMakeupListener; private MakeupHandler mHandler = new MakeupHandler(); private static final int MAKEUP_MESSAGE_ID = 0; + private HashSet<View> mWasVisibleSet = new HashSet<View>(); public PhotoMenu(CameraActivity activity, PhotoUI ui, MakeupLevelListener makeupListener) { super(activity); @@ -1483,7 +1485,17 @@ public class PhotoMenu extends MenuController } 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); } } |