diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-04-04 19:05:21 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-05-26 16:48:17 -0700 |
| commit | 0abd747b096e3786cd90a66605e1a39d92453b15 (patch) | |
| tree | facf0ebc6a4d20c14b454a39b429a39cadf495a8 /src/com/android/camera/PhotoMenu.java | |
| parent | d3383e87fce92ecfde2a8916d121def3fe101566 (diff) | |
| download | android_packages_apps_Snap-0abd747b096e3786cd90a66605e1a39d92453b15.tar.gz android_packages_apps_Snap-0abd747b096e3786cd90a66605e1a39d92453b15.tar.bz2 android_packages_apps_Snap-0abd747b096e3786cd90a66605e1a39d92453b15.zip | |
SnapdragonCamera: disable instant capture in some cases.
1. Disable instant capture when ZSL is off or advanced features
are enabled
2. Change the instant capture option to support the selection of
aggressive AEC and fast AEC
CRs-Fixed: 998509
Change-Id: I60f7ed3a0fc93627dbf7527fbec2a60605aad683
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index b9ecdcc8d..46da31cfe 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -731,6 +731,8 @@ public class PhotoMenu extends MenuController mActivity.getString(R.string.pref_camera_advanced_feature_default)); popup1.setPreferenceEnabled(CameraSettings.KEY_ADVANCED_FEATURES, false); + popup1.setPreferenceEnabled(CameraSettings.KEY_INSTANT_CAPTURE, false); + if(!TsMakeupManager.HAS_TS_MAKEUP) { if (mHdrSwitcher.getVisibility() == View.VISIBLE) { buttonSetEnabled(mHdrSwitcher, true); @@ -752,7 +754,7 @@ public class PhotoMenu extends MenuController popup1.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT, false); popup1.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC, false); popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false); - + popup1.setPreferenceEnabled(CameraSettings.KEY_INSTANT_CAPTURE, false); setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff); if(!TsMakeupManager.HAS_TS_MAKEUP) { if (mHdrSwitcher.getVisibility() == View.VISIBLE) { |