summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjt1134 <jt1134@gmail.com>2014-01-20 19:45:13 +0200
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:02 +0300
commit94edc409d9bfdd721f424a4d3b46adeaabfb165b (patch)
tree6d5e455d46a148ad1cbf85a69725e8a4e4b62917
parent8c66754ec9e4c88af913ef75b28030f1345a4b5b (diff)
downloadandroid_packages_apps_Snap-94edc409d9bfdd721f424a4d3b46adeaabfb165b.zip
android_packages_apps_Snap-94edc409d9bfdd721f424a4d3b46adeaabfb165b.tar.gz
android_packages_apps_Snap-94edc409d9bfdd721f424a4d3b46adeaabfb165b.tar.bz2
Camera: separate settings for color effects
Store color effect settings for the camera and video camera in their own separate preferences. Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
-rw-r--r--res/xml/video_preferences.xml2
-rw-r--r--src/com/android/camera/CameraSettings.java1
-rw-r--r--src/com/android/camera/VideoMenu.java6
-rw-r--r--src/com/android/camera/VideoModule.java2
4 files changed, 6 insertions, 5 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index f147ed2..2c67a47 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -116,7 +116,7 @@
camera:entries="@array/pref_camera_dis_entries"
camera:entryValues="@array/pref_camera_dis_entryvalues" />
<IconListPreference
- camera:key="pref_camera_coloreffect_key"
+ camera:key="pref_camera_video_coloreffect_key"
camera:defaultValue="@string/pref_camera_coloreffect_default"
camera:title="@string/pref_camera_coloreffect_title"
camera:entries="@array/pref_camera_coloreffect_entries"
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 9004dd2..b60c659 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -84,6 +84,7 @@ public class CameraSettings {
public static final String KEY_ZSL = "pref_camera_zsl_key";
public static final String KEY_CAMERA_SAVEPATH = "pref_camera_savepath_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 d10c817..ead8645 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -499,7 +499,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)
return;
@@ -531,7 +531,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;
@@ -756,7 +756,7 @@ public class VideoMenu extends MenuController
public void showUI() {
mFrontBackSwitcher.setVisibility(View.VISIBLE);
final IconListPreference pref = (IconListPreference) mPreferenceGroup
- .findPreference(CameraSettings.KEY_COLOR_EFFECT);
+ .findPreference(CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT);
if (pref != null) {
mFilterModeSwitcher.setVisibility(View.VISIBLE);
}
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 61e0092..b85f918 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2020,7 +2020,7 @@ public class VideoModule implements CameraModule,
// add QCOM Parameters here
// Set color effect parameter.
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())) {