diff options
| author | Likai Ding <likaid@codeaurora.org> | 2014-05-28 14:36:23 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2014-05-29 17:31:03 +0800 |
| commit | 4b5db0d2d0c847afc263587dc9d9d3467d0d611b (patch) | |
| tree | 1ca823a095b75a95e164bd819579b2cf20797078 /src/com/android/camera/PhotoMenu.java | |
| parent | 0542ce1f6f50af1ef45d8623ff3cdc2cc3a92f6b (diff) | |
| download | android_packages_apps_Snap-4b5db0d2d0c847afc263587dc9d9d3467d0d611b.tar.gz android_packages_apps_Snap-4b5db0d2d0c847afc263587dc9d9d3467d0d611b.tar.bz2 android_packages_apps_Snap-4b5db0d2d0c847afc263587dc9d9d3467d0d611b.zip | |
Camera2: disable ZSL setting during counting down
During counting down, ZSL setting should not be changed by user.
Add check in popup initialization as well.
Change-Id: I02439aef78adaa190158452ea034fa19256f9d85
CRs-Fixed: 664691
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index d4d820949..4b7fc49ed 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -270,6 +270,7 @@ public class PhotoMenu extends PieController if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)){ popup2.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION,false); } + popup1.setPreferenceEnabled(CameraSettings.KEY_ZSL, !mUI.isCountingDown()); pref = mPreferenceGroup.findPreference(CameraSettings.KEY_ADVANCED_FEATURES); String advancedFeatures = (pref != null) ? pref.getValue() : null; |