diff options
| author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2014-12-31 16:56:18 +0530 |
|---|---|---|
| committer | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2015-01-05 09:42:20 +0530 |
| commit | 47f255837f6f035d9da590fe8e52b994a97bd0af (patch) | |
| tree | 4de20259d127e49c1ea13cdb0f475ce479247209 | |
| parent | d5bb29f7b1f4107f0128ae5949dad2093e264564 (diff) | |
| download | android_packages_apps_Snap-47f255837f6f035d9da590fe8e52b994a97bd0af.tar.gz android_packages_apps_Snap-47f255837f6f035d9da590fe8e52b994a97bd0af.tar.bz2 android_packages_apps_Snap-47f255837f6f035d9da590fe8e52b994a97bd0af.zip | |
SnapdragonCamera: Don't override preferences for CMCC misc settings.
Instead of overriding preferences and giving no way to change them
again, just reset the preferences to corresponding off/default
values, so that user can still be able to change them.
Change-Id: I49f654d79af8268f170a611d5cbca28a2fa716ae
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 32cd5dcf7..2e53f21df 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -484,6 +484,7 @@ public class PhotoModule case SWITCH_TO_GCAM_MODULE: { mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX); + break; } case CONFIGURE_SKIN_TONE_FACTOR: { @@ -708,6 +709,7 @@ public class PhotoModule updateCameraSettings(); showTapToFocusToastIfNeeded(); resetManual3ASettings(); + resetMiscSettings(); } @Override @@ -761,6 +763,25 @@ public class PhotoModule mManual3AEnabled = 0; } + private void resetMiscSettings() { + boolean disableQcomMiscSetting = + SystemProperties.getBoolean("camera.qcom.misc.disable", false); + if (disableQcomMiscSetting) { + mUI.setPreference(CameraSettings.KEY_ZSL, Parameters.ZSL_OFF); + mUI.setPreference(CameraSettings.KEY_FACE_DETECTION, + Parameters.FACE_DETECTION_OFF); + mUI.setPreference(CameraSettings.KEY_TOUCH_AF_AEC, + Parameters.TOUCH_AF_AEC_OFF); + mUI.setPreference(CameraSettings.KEY_FOCUS_MODE, + Parameters.FOCUS_MODE_AUTO); + mUI.setPreference(CameraSettings.KEY_FLASH_MODE, + Parameters.FLASH_MODE_OFF); + mUI.setPreference(CameraSettings.KEY_DENOISE, + Parameters.DENOISE_OFF); + onSharedPreferenceChanged(); + } + } + void setPreviewFrameLayoutCameraOrientation(){ CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; //if camera mount angle is 0 or 180, we want to resize preview @@ -1812,17 +1833,6 @@ public class PhotoModule } else { mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null); } - - boolean disableQcomMiscSetting = - SystemProperties.getBoolean("camera.qcom.misc.disable", false); - if (disableQcomMiscSetting) { - mUI.overrideSettings(CameraSettings.KEY_ZSL, Parameters.ZSL_OFF); - mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, Parameters.FACE_DETECTION_OFF); - mUI.overrideSettings(CameraSettings.KEY_TOUCH_AF_AEC, Parameters.TOUCH_AF_AEC_OFF); - mUI.overrideSettings(CameraSettings.KEY_FOCUS_MODE, Parameters.FOCUS_MODE_AUTO); - mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, Parameters.FLASH_MODE_OFF); - mUI.overrideSettings(CameraSettings.KEY_DENOISE, Parameters.DENOISE_OFF); - } } private void overrideCameraSettings(final String flashMode, |