diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-05 13:57:39 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-05 13:57:39 -0800 |
commit | 2667c64854536d51650a8bf66faae35e1e420979 (patch) | |
tree | 43ecb4989d81169929bf1b1276329195afa9457d /src | |
parent | 442c3737d572924828a05d518cfb6c3560f0077d (diff) | |
parent | 2b0ee6c8deea616dca33441d5e775280abe16924 (diff) | |
download | android_packages_apps_Snap-2667c64854536d51650a8bf66faae35e1e420979.tar.gz android_packages_apps_Snap-2667c64854536d51650a8bf66faae35e1e420979.tar.bz2 android_packages_apps_Snap-2667c64854536d51650a8bf66faae35e1e420979.zip |
Merge "SnapdragonCamera: Color effect is still dispalyed grey after disable HDR" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 2da33ebbd..991b4a367 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1399,14 +1399,15 @@ public class PhotoMenu extends MenuController setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO); } updateSceneModeIcon((IconListPreference) scenePref); - } else if (same(pref, CameraSettings.KEY_CAMERA_HDR, mSettingOn)) { + updateFilterModeIcon(scenePref, pref); + } else if (same(pref, CameraSettings.KEY_CAMERA_HDR, mSettingOn)) { ListPreference scenePref = mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE); if (scenePref != null && notSame(scenePref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_HDR)) { setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_HDR); } updateSceneModeIcon((IconListPreference) scenePref); - } else if (notSame(pref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) { + } else if (notSame(pref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) { RotateTextToast.makeText(mActivity, R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show(); setPreference(CameraSettings.KEY_FLASH_MODE,Parameters.FLASH_MODE_OFF); |