diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-09 12:37:26 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-09 12:37:26 -0800 |
commit | 3479484dc62c294803ff0284713803ee83954083 (patch) | |
tree | d052602571e59d9504643986a2838d4ef56eca4f /src | |
parent | f95d7a766fd37a9239d9fe734b6dafe5756f00d8 (diff) | |
parent | 70b26edba27744ef7b544a0d55c0cec35b0ceba9 (diff) | |
download | android_packages_apps_Snap-3479484dc62c294803ff0284713803ee83954083.tar.gz android_packages_apps_Snap-3479484dc62c294803ff0284713803ee83954083.tar.bz2 android_packages_apps_Snap-3479484dc62c294803ff0284713803ee83954083.zip |
Merge "SnapdragonCamera: Disable filter mode when HDR is on"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index f8d95b3f0..be3a02c1f 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -541,6 +541,7 @@ public class PhotoMenu extends MenuController ListPreference pref = mPreferenceGroup.findPreference( CameraSettings.KEY_SCENE_MODE); + updateFilterModeIcon(pref, mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR)); String sceneMode = (pref != null) ? pref.getValue() : null; pref = mPreferenceGroup.findPreference(CameraSettings.KEY_FACE_DETECTION); String faceDetection = (pref != null) ? pref.getValue() : null; @@ -629,20 +630,21 @@ public class PhotoMenu extends MenuController } } - pref = mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE); - if (pref != null) { - if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { - buttonSetEnabled(mFilterModeSwitcher, false); - } else { - buttonSetEnabled(mFilterModeSwitcher, true); - } - } - if (mListener != null) { mListener.onSharedPreferenceChanged(); } } + private void updateFilterModeIcon(ListPreference scenePref, ListPreference hdrPref) { + if (scenePref == null || hdrPref == null) return; + if ((notSame(scenePref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) + || (notSame(hdrPref, CameraSettings.KEY_CAMERA_HDR, mSettingOff))) { + buttonSetEnabled(mFilterModeSwitcher, false); + } else { + buttonSetEnabled(mFilterModeSwitcher, true); + } + } + public void initSwitchItem(final String prefKey, View switcher) { final IconListPreference pref = (IconListPreference) mPreferenceGroup.findPreference(prefKey); @@ -1072,6 +1074,7 @@ public class PhotoMenu extends MenuController Toast.LENGTH_LONG).show(); } setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO); + updateSceneModeIcon((IconListPreference) scenePref); } else if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { ListPreference hdrPref = mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR); @@ -1126,12 +1129,7 @@ public class PhotoMenu extends MenuController mActivity.getString(R.string.pref_camera_advanced_feature_default)); } } - - if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { - buttonSetEnabled(mFilterModeSwitcher, false); - } else { - buttonSetEnabled(mFilterModeSwitcher, true); - } + updateFilterModeIcon(pref, pref); super.onSettingChanged(pref); } |