diff options
| author | Abhishek Pant <apant@codeaurora.org> | 2013-12-04 15:51:48 +0530 |
|---|---|---|
| committer | Abhishek Pant <apant@codeaurora.org> | 2014-06-06 18:57:35 +0530 |
| commit | cb4748b2c5e264fc5185005d366cbdf5db140674 (patch) | |
| tree | e66e3261880f96876eac62390562806fec0c2ddd /src/com/android/camera/PhotoMenu.java | |
| parent | ae531060071669eb4fcb10f04420f941bc04115c (diff) | |
| download | android_packages_apps_Snap-cb4748b2c5e264fc5185005d366cbdf5db140674.tar.gz android_packages_apps_Snap-cb4748b2c5e264fc5185005d366cbdf5db140674.tar.bz2 android_packages_apps_Snap-cb4748b2c5e264fc5185005d366cbdf5db140674.zip | |
Camera2: Adding support for Auto HDR
Adding support for Auto HDR for camera application.
CRs-fixed: 629556
Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index a9526962b..c80a49835 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -104,7 +104,8 @@ public class PhotoMenu extends PieController CameraSettings.KEY_TIMER, CameraSettings.KEY_TIMER_SOUND_EFFECTS, CameraSettings.KEY_CAMERA_SAVEPATH, - CameraSettings.KEY_LONGSHOT + CameraSettings.KEY_LONGSHOT, + CameraSettings.KEY_AUTO_HDR }; mOtherKeys2 = new String[] { @@ -252,7 +253,10 @@ public class PhotoMenu extends PieController String faceDetection = (pref != null) ? pref.getValue() : null; pref = mPreferenceGroup.findPreference(CameraSettings.KEY_ZSL); String zsl = (pref != null) ? pref.getValue() : null; - if ((sceneMode != null) && !Parameters.SCENE_MODE_AUTO.equals(sceneMode)){ + pref = mPreferenceGroup.findPreference (CameraSettings.KEY_AUTO_HDR); + String autohdr = (pref != null) ? pref.getValue() : null; + if (((sceneMode != null) && !Parameters.SCENE_MODE_AUTO.equals(sceneMode)) + || ((autohdr != null) && autohdr.equals("enable"))) { popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); popup2.setPreferenceEnabled(CameraSettings.KEY_AUTOEXPOSURE,false); popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false); @@ -264,6 +268,9 @@ public class PhotoMenu extends PieController popup3.setPreferenceEnabled(CameraSettings.KEY_WHITE_BALANCE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE,false); } + if ((autohdr != null) && autohdr.equals("enable")) { + popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE,false); + } if ((zsl != null) && Parameters.ZSL_ON.equals(zsl)) { popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); } |