diff options
| author | Camera Software Integration <camswint@localhost> | 2017-01-23 23:34:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-23 23:34:42 -0800 |
| commit | 87501f947ac1ce73e9d351a507cd1a6134460c21 (patch) | |
| tree | 9f0d250f31ab99b6a3ed859a2e912fe369f9d03b /src | |
| parent | 36f2a32a9277b09badec5a16d7f6b8c9b581015e (diff) | |
| parent | fc26c3cb8c154b9ebee6d843339df675b75b9acc (diff) | |
| download | android_packages_apps_Snap-87501f947ac1ce73e9d351a507cd1a6134460c21.tar.gz android_packages_apps_Snap-87501f947ac1ce73e9d351a507cd1a6134460c21.tar.bz2 android_packages_apps_Snap-87501f947ac1ce73e9d351a507cd1a6134460c21.zip | |
Merge "SnapdragonCamera: Fix does`t support UbiFocus and HDR meanwhile" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ecdae4dd3..3b7456f2e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3906,6 +3906,7 @@ public class PhotoModule .pref_camera_advanced_feature_value_refocus_on); String optizoomOn = mActivity.getString(R.string .pref_camera_advanced_feature_value_optizoom_on); + String scenModeStr = mSceneMode; if (refocusOn.equals(mSceneMode)) { try { mSceneMode = Parameters.SCENE_MODE_AUTO; @@ -3929,6 +3930,9 @@ public class PhotoModule if (CameraUtil.isSupported(mSceneMode, mParameters.getSupportedSceneModes())) { if (!mParameters.getSceneMode().equals(mSceneMode)) { + if (mHandler.getLooper() == Looper.myLooper()) { + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, scenModeStr); + } mParameters.setSceneMode(mSceneMode); // Setting scene mode will change the settings of flash mode, @@ -4649,6 +4653,11 @@ public class PhotoModule if (CameraSettings.KEY_ADVANCED_FEATURES.equals(pref.getKey())) { mUI.setPreference(CameraSettings.KEY_QC_CHROMA_FLASH, pref.getValue()); + mUI.setPreference(CameraSettings.KEY_SCENE_MODE, pref.getValue()); + } + + if (CameraSettings.KEY_CAMERA_HDR.equals(pref.getKey())) { + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, pref.getValue()); } String ubiFocusOff = mActivity.getString(R.string. diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 1e28080f4..b85d7f1ca 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -244,6 +244,8 @@ public class CameraControls extends RotatableLayout { mFrontBackSwitcher.setEnabled(enable); if(TsMakeupManager.HAS_TS_MAKEUP) { mTsMakeupSwitcher.setEnabled(enable); + } else { + mHdrSwitcher.setEnabled(enable); } mPreview.setEnabled(enable); |