summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-09-14 14:51:39 +0800
committerlikaid <likaid@codeaurora.org>2015-09-14 14:51:39 +0800
commitf02de4e1d27d3be02b259c4f296c7b6d87d83e5c (patch)
treea23e5ea9e4b65519e548ae770a5a270c5683bd60 /src/com/android/camera/PhotoMenu.java
parent465c11e451e18b7f3e8109fdbbc56b866f7f8a56 (diff)
downloadandroid_packages_apps_Snap-f02de4e1d27d3be02b259c4f296c7b6d87d83e5c.tar.gz
android_packages_apps_Snap-f02de4e1d27d3be02b259c4f296c7b6d87d83e5c.tar.bz2
android_packages_apps_Snap-f02de4e1d27d3be02b259c4f296c7b6d87d83e5c.zip
SnapdragonCamera: Hide all camera setting when countdown timer starts
Camera setting including module switcher scene mode filter mode and front/back camera switcher should not be used during countdown timer, since it may cause unexpected concurrent errors. Hide all the camera settings when countdown timer starts, show them again after countdown. Change-Id: I79c2add63c61d304fe0948e1c9fefe3a8c1a6fee CRs-Fixed: 900086
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 8bdbb6c47..b0c975072 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -96,6 +96,9 @@ public class PhotoMenu extends MenuController
private View mFrontBackSwitcher;
private View mSceneModeSwitcher;
private View mFilterModeSwitcher;
+ private View mCameraSwitcher;
+ private View mSettingMenu;
+ private View mPreviewThumbnail;
private PhotoUI mUI;
private int mPopupStatus;
private int mPreviewMenuStatus;
@@ -125,6 +128,9 @@ public class PhotoMenu extends MenuController
mSceneModeSwitcher = ui.getRootView().findViewById(R.id.scene_mode_switcher);
mFilterModeSwitcher = ui.getRootView().findViewById(R.id.filter_mode_switcher);
mMakeupListener = makeupListener;
+ mSettingMenu = ui.getRootView().findViewById(R.id.menu);
+ mCameraSwitcher = ui.getRootView().findViewById(R.id.camera_switcher);
+ mPreviewThumbnail = ui.getRootView().findViewById(R.id.preview_thumb);
}
public void initialize(PreferenceGroup group) {
@@ -1410,4 +1416,19 @@ public class PhotoMenu extends MenuController
mTsMakeupSwitcher.setVisibility(View.VISIBLE);
}
}
+
+ public void hideCameraControls(boolean hide) {
+ final int status = (hide) ? View.INVISIBLE : View.VISIBLE;
+ mSettingMenu.setVisibility(status);
+ mFrontBackSwitcher.setVisibility(status);
+ if (TsMakeupManager.HAS_TS_MAKEUP) {
+ mTsMakeupSwitcher.setVisibility(status);
+ } else {
+ mHdrSwitcher.setVisibility(status);
+ }
+ mSceneModeSwitcher.setVisibility(status);
+ mFilterModeSwitcher.setVisibility(status);
+ mCameraSwitcher.setVisibility(status);
+ mPreviewThumbnail.setVisibility(status);
+ }
}