diff options
| author | mingwax <mingwax@codeaurora.org> | 2017-01-12 17:34:18 +0800 |
|---|---|---|
| committer | mingwax <mingwax@codeaurora.org> | 2017-01-12 17:42:20 +0800 |
| commit | b3f0ed3b8be79c3f96f2446a463c1c522b6f695f (patch) | |
| tree | 9fb555e6f8acde0eb5905cbd8568291b600d1f29 /src | |
| parent | 15f6d966c807c371a12f68bf9f5f4e7447a9ba8e (diff) | |
| download | android_packages_apps_Snap-b3f0ed3b8be79c3f96f2446a463c1c522b6f695f.tar.gz android_packages_apps_Snap-b3f0ed3b8be79c3f96f2446a463c1c522b6f695f.tar.bz2 android_packages_apps_Snap-b3f0ed3b8be79c3f96f2446a463c1c522b6f695f.zip | |
SnapdragonCamera: Fix does`t support HDR and chromaflash meanwhile
Chroma Flash、 Adwanced Features and HDR do mutual exclusion.
CRs-Fixed: 1107236
Change-Id: I7e9f94fb757693fd5df7391ef94f194af3dae65c
Diffstat (limited to 'src')
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/PhotoModule.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 860c29540..ecdae4dd3 100755..100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4647,6 +4647,10 @@ public class PhotoModule mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, pref.getValue()); } + if (CameraSettings.KEY_ADVANCED_FEATURES.equals(pref.getKey())) { + mUI.setPreference(CameraSettings.KEY_QC_CHROMA_FLASH, pref.getValue()); + } + String ubiFocusOff = mActivity.getString(R.string. pref_camera_advanced_feature_value_ubifocus_off); String chromaFlashOff = mActivity.getString(R.string. diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index b85d7f1ca..1e28080f4 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -244,8 +244,6 @@ public class CameraControls extends RotatableLayout { mFrontBackSwitcher.setEnabled(enable); if(TsMakeupManager.HAS_TS_MAKEUP) { mTsMakeupSwitcher.setEnabled(enable); - } else { - mHdrSwitcher.setEnabled(enable); } mPreview.setEnabled(enable); |