diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-29 10:33:36 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:56 -0600 |
| commit | 901ddaa0b4f56cc861888fb6e295e4b6273ff3de (patch) | |
| tree | 7afa580b2687abbef2cfd8c44bf7d5d7d9fbad77 /src/com/android/camera/PhotoMenu.java | |
| parent | 86a58efe8ebc817e77075d17d68ebf3f216b1b34 (diff) | |
| download | android_packages_apps_Snap-901ddaa0b4f56cc861888fb6e295e4b6273ff3de.tar.gz android_packages_apps_Snap-901ddaa0b4f56cc861888fb6e295e4b6273ff3de.tar.bz2 android_packages_apps_Snap-901ddaa0b4f56cc861888fb6e295e4b6273ff3de.zip | |
Camera: Gray out unsupported options when scene mode is not set to Auto
When scene mode is set to a value other than Auto, camera application is
querying for the focus, autoExposure, flash, white balance, exposure
values. Framework is returning the values which user had set irrespective
of whether they are supported or not. And also there was no check during
the initalization of the settings dialogs. This change will enable the
above settings only if scene mode is set to auto.
Change-Id: I1e4e84c405c5d163ac352854d3a847bba63831c9
(cherry picked from commit 4cbc5da11bd9e378c5e82d31688aa0e8917ae483)
(cherry picked from commit b07c51a67b576bc564a8073ca0f7f5d5e2ee7ef8)
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 7e60cd950..5ebd58098 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -253,6 +253,23 @@ public class PhotoMenu extends PieController popup3.setSettingChangedListener(this); popup3.initialize(mPreferenceGroup, mOtherKeys3); mPopup3 = popup3; + + ListPreference pref = mPreferenceGroup.findPreference( + CameraSettings.KEY_SCENE_MODE); + String sceneMode = pref.getValue(); + pref = mPreferenceGroup.findPreference(CameraSettings.KEY_FACE_DETECTION); + String faceDetection = pref.getValue(); + if (!Parameters.SCENE_MODE_AUTO.equals(sceneMode)){ + popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); + popup2.setPreferenceEnabled(CameraSettings.KEY_AUTOEXPOSURE,false); + popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_WHITE_BALANCE,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE,false); + } + if (!Parameters.FACE_DETECTION_ON.equals(faceDetection)){ + popup2.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION,false); + } } public void popupDismissed() { |