diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-03-31 16:08:52 -0700 |
---|---|---|
committer | Jack Yoo <jyoo@codeaurora.org> | 2016-03-31 16:08:52 -0700 |
commit | bfe8fa42b51c2cddd80256048d020789348403dd (patch) | |
tree | 380ff66d790a34b784105b21e1fcc367a9566686 /src/com/android/camera/PhotoMenu.java | |
parent | f12aabf6cc14021a7412657a3cfb9ec089e56dde (diff) | |
download | android_packages_apps_Snap-bfe8fa42b51c2cddd80256048d020789348403dd.tar.gz android_packages_apps_Snap-bfe8fa42b51c2cddd80256048d020789348403dd.tar.bz2 android_packages_apps_Snap-bfe8fa42b51c2cddd80256048d020789348403dd.zip |
SnapdragonCamera: Make switcher visible only when it was
Make switcher button be visible only when it was set to
be visible in first place.
Change-Id: Id0df702b990bbada02ac25eb6981c6bd5e4082b0
CRs-Fixed: 995902
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-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); } } |