diff options
author | likaid <likaid@codeaurora.org> | 2015-09-14 14:51:39 +0800 |
---|---|---|
committer | likaid <likaid@codeaurora.org> | 2015-09-14 14:51:39 +0800 |
commit | f02de4e1d27d3be02b259c4f296c7b6d87d83e5c (patch) | |
tree | a23e5ea9e4b65519e548ae770a5a270c5683bd60 /src/com/android | |
parent | 465c11e451e18b7f3e8109fdbbc56b866f7f8a56 (diff) | |
download | android_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')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 21 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 12 |
3 files changed, 34 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); + } } diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index b7a38dd09..e60f16fd5 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4390,6 +4390,7 @@ public class PhotoModule mFocusManager.doSnap(); mFocusManager.onShutterUp(); mUI.overrideSettings(CameraSettings.KEY_ZSL, null); + mUI.showUIAfterCountDown(); } @Override diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 276a78db2..ab3fae00a 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -1137,11 +1137,13 @@ public class PhotoUI implements PieListener, public void cancelCountDown() { if (mCountDownView == null) return; mCountDownView.cancelCountDown(); + showUIAfterCountDown(); } public void startCountDown(int sec, boolean playSound) { if (mCountDownView == null) initializeCountDown(); mCountDownView.startCountDown(sec, playSound); + hideUIWhileCountDown(); } public void showPreferencesToast() { @@ -1351,4 +1353,14 @@ public class PhotoUI implements PieListener, .show(); } } + + public void hideUIWhileCountDown() { + mMenu.hideCameraControls(true); + mGestures.setZoomOnly(true); + } + + public void showUIAfterCountDown() { + mMenu.hideCameraControls(false); + mGestures.setZoomOnly(false); + } } |