diff options
| author | jt1134 <jt1134@gmail.com> | 2014-01-20 19:45:13 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 00:51:41 +0100 |
| commit | 29d6b02dfaf6736f2245d08ca1b5f8834036478e (patch) | |
| tree | ec6078104809f87f99246db3bd0e9a735a69e6fb /src/com/android/camera | |
| parent | 7cc55a352ff638ea109e557a01ffacfe562a55d9 (diff) | |
| download | android_packages_apps_Snap-29d6b02dfaf6736f2245d08ca1b5f8834036478e.tar.gz android_packages_apps_Snap-29d6b02dfaf6736f2245d08ca1b5f8834036478e.tar.bz2 android_packages_apps_Snap-29d6b02dfaf6736f2245d08ca1b5f8834036478e.zip | |
Camera: separate settings for color effects
Store color effect settings for the camera and
video camera in their own separate preferences.
Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index fd6db1d5e..3c388c912 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -89,6 +89,7 @@ public class CameraSettings { public static final String KEY_CAMERA_SAVEPATH = "pref_camera_savepath_key"; public static final String KEY_FILTER_MODE = "pref_camera_filter_mode_key"; public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key"; + public static final String KEY_VIDEOCAMERA_COLOR_EFFECT = "pref_camera_video_coloreffect_key"; public static final String KEY_FACE_DETECTION = "pref_camera_facedetection_key"; public static final String KEY_TOUCH_AF_AEC = "pref_camera_touchafaec_key"; public static final String KEY_SELECTABLE_ZONE_AF = "pref_camera_selectablezoneaf_key"; diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 330fa2ace..e891ce7af 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -508,7 +508,7 @@ public class VideoMenu extends MenuController public void initFilterModeButton(View button) { button.setVisibility(View.INVISIBLE); final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_COLOR_EFFECT); + .findPreference(CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT); if (pref == null || pref.getValue() == null) return; @@ -536,7 +536,7 @@ public class VideoMenu extends MenuController public void addFilterMode() { final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_COLOR_EFFECT); + .findPreference(CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT); if (pref == null) return; diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index fcf966ce6..e83177716 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2335,7 +2335,7 @@ public class VideoModule implements CameraModule, setZoomMenuValue(); String colorEffect = mPreferences.getString( - CameraSettings.KEY_COLOR_EFFECT, + CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT, mActivity.getString(R.string.pref_camera_coloreffect_default)); Log.v(TAG, "Color effect value =" + colorEffect); if (isSupported(colorEffect, mParameters.getSupportedColorEffects())) { |