diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-01-21 10:20:42 -0800 |
---|---|---|
committer | Camera Software Integration <camswint@localhost> | 2016-01-24 13:03:28 -0700 |
commit | dfa53a78e5681ee772f29eba8ab44cdf864a5a44 (patch) | |
tree | b21ab82b806999e6684809b13f5dbaa4cc98ecd8 /src/com | |
parent | 5cca0e8991ee9fa3f30805944390055d410fefd3 (diff) | |
download | android_packages_apps_Snap-dfa53a78e5681ee772f29eba8ab44cdf864a5a44.tar.gz android_packages_apps_Snap-dfa53a78e5681ee772f29eba8ab44cdf864a5a44.tar.bz2 android_packages_apps_Snap-dfa53a78e5681ee772f29eba8ab44cdf864a5a44.zip |
SnapdragonCamera: Fix the menu key name of filter mode.
Correcting the key name of the filter mode menu.
Change-Id: If52b31c55f62ffd5b65bc8336ec443cde0328101
CRs-Fixed: 951550
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 2cb544e6e..a725b471c 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1085,8 +1085,8 @@ public class PhotoMenu extends MenuController public void initFilterModeButton(View button) { button.setVisibility(View.INVISIBLE); final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_FILTER_MODE); - if (pref == null) + .findPreference(CameraSettings.KEY_COLOR_EFFECT); + if (pref == null || pref.getValue() == null) return; int[] iconIds = pref.getLargeIconIds(); diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index dcca97d68..2e34f2446 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -502,8 +502,8 @@ public class VideoMenu extends MenuController public void initFilterModeButton(View button) { button.setVisibility(View.INVISIBLE); final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_FILTER_MODE); - if (pref == null) + .findPreference(CameraSettings.KEY_COLOR_EFFECT); + if (pref == null || pref.getValue() == null) return; int[] iconIds = pref.getLargeIconIds(); |