diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-09-25 02:00:53 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-09-25 02:00:53 -0700 |
commit | 23362f853387904fa887d3d97271460a509830c8 (patch) | |
tree | 8eb4942858906e9643c0c7d60f3ee12b8f2d86d4 | |
parent | be517166b384881e43c288cda0427d82b67b2064 (diff) | |
parent | f02de4e1d27d3be02b259c4f296c7b6d87d83e5c (diff) | |
download | android_packages_apps_Snap-23362f853387904fa887d3d97271460a509830c8.tar.gz android_packages_apps_Snap-23362f853387904fa887d3d97271460a509830c8.tar.bz2 android_packages_apps_Snap-23362f853387904fa887d3d97271460a509830c8.zip |
Merge "SnapdragonCamera: Hide all camera setting when countdown timer starts"
-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); + } } |