diff options
| author | weijiew <weijiew@codeaurora.org> | 2016-12-29 10:39:56 +0800 |
|---|---|---|
| committer | weijiew <weijiew@codeaurora.org> | 2016-12-29 10:47:34 +0800 |
| commit | 2b0ee6c8deea616dca33441d5e775280abe16924 (patch) | |
| tree | 359c7ec3319b374703b361443e9cf45acc26e873 /src/com/android/camera/PhotoMenu.java | |
| parent | ec1cdf7f6b81e42e90c6d0627955eae5fac1f294 (diff) | |
| download | android_packages_apps_Snap-2b0ee6c8deea616dca33441d5e775280abe16924.tar.gz android_packages_apps_Snap-2b0ee6c8deea616dca33441d5e775280abe16924.tar.bz2 android_packages_apps_Snap-2b0ee6c8deea616dca33441d5e775280abe16924.zip | |
SnapdragonCamera: Color effect is still dispalyed grey after disable HDR
RootCase:Color effect button state is not updated when HDR is disabled
CRs-Fixed: 1105803
Change-Id: Iaf596344a011ee604db5cff573e3a9b926cebac8
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -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); |