summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorAlok Kediya <kediya@codeaurora.org>2013-09-28 17:39:13 +0530
committerLinux Build Service Account <lnxbuild@localhost>2013-10-31 19:39:44 -0600
commit4b6f3f924aa4fc207be69b285db7133995efd706 (patch)
tree509a11ae7cc800e5b72d27c93c58d7fa9413b9c2 /src/com/android/camera/CameraSettings.java
parent6f9440bb6489cf96e5510e0a396aa25c356c92ad (diff)
downloadandroid_packages_apps_Snap-4b6f3f924aa4fc207be69b285db7133995efd706.tar.gz
android_packages_apps_Snap-4b6f3f924aa4fc207be69b285db7133995efd706.tar.bz2
android_packages_apps_Snap-4b6f3f924aa4fc207be69b285db7133995efd706.zip
Camera: Support stream based flip
Flip operation needs to be done per stream. App will read from system property about stream based flipping setting and set corresponding parameters to let camera hardware to apply flipping setting per stream. To keep app behavior persistent when flip and rotation are enabled, need to take case H/V flip when 90 or 270 rotation happens. Need to reverse H/V flip to acheive same output no matter device is in portait or landscape mode. (cherrypicked from commit b38b8246204871082dc7ac6f5e626d6162d2be70) Change-Id: Ia06060709162237dece1a05a3ae58429a0c99b06 Conflicts: src/com/android/camera/util/CameraUtil.java (cherry picked from commit b6aff328cdd99fb0db11c989a72f5eafd7d82324) (cherry picked from commit 29888be992b8955f88a2f89ffd407733d771c1e6)
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index dfef7c38c..352e34dda 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -104,6 +104,18 @@ public class CameraSettings {
private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values";
public static final String KEY_QC_AE_BRACKETING = "ae-bracket-hdr";
public static final String KEY_QC_FACE_RECOGNITION = "face-recognition";
+
+ //for flip
+ public static final String KEY_QC_PREVIEW_FLIP = "preview-flip";
+ public static final String KEY_QC_VIDEO_FLIP = "video-flip";
+ public static final String KEY_QC_SNAPSHOT_PICTURE_FLIP = "snapshot-picture-flip";
+ public static final String KEY_QC_SUPPORTED_FLIP_MODES = "flip-mode-values";
+
+ public static final String FLIP_MODE_OFF = "off";
+ public static final String FLIP_MODE_V = "flip-v";
+ public static final String FLIP_MODE_H = "flip-h";
+ public static final String FLIP_MODE_VH = "flip-vh";
+
private static final String KEY_QC_PICTURE_FORMAT = "picture-format-values";
private static final String VIDEO_QUALITY_HIGH = "high";
private static final String VIDEO_QUALITY_MMS = "mms";
@@ -239,6 +251,15 @@ public class CameraSettings {
}
return split(str);
}
+
+ public static List<String> getSupportedFlipMode(Parameters params){
+ String str = params.get(KEY_QC_SUPPORTED_FLIP_MODES);
+ if(str == null)
+ return null;
+
+ return split(str);
+ }
+
private void qcomInitPreferences(PreferenceGroup group){
//Qcom Preference add here
ListPreference powerMode = group.findPreference(KEY_POWER_MODE);