summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/PhotoMenu.java4
-rw-r--r--src/com/android/camera/VideoMenu.java4
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();