summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/qcomarrays.xml2
-rw-r--r--res/values/qcomstrings.xml3
-rw-r--r--src/com/android/camera/CameraSettings.java11
-rw-r--r--src/com/android/camera/PhotoMenu.java3
-rw-r--r--src/com/android/camera/PhotoModule.java26
5 files changed, 45 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 776fae6de..ae2201c58 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -588,6 +588,7 @@
<item>@string/pref_camera_advanced_feature_entry_refocus</item>
<item>@string/pref_camera_advanced_feature_entry_chromaflash</item>
<item>@string/pref_camera_advanced_feature_entry_optizoom</item>
+ <item>@string/pref_camera_advanced_feature_entry_FSSR</item>
<item>@string/pref_camera_advanced_feature_entry_trueportrait</item>
</string-array>
@@ -597,6 +598,7 @@
<item>@string/pref_camera_advanced_feature_value_refocus_on</item>
<item>@string/pref_camera_advanced_feature_value_chromaflash_on</item>
<item>@string/pref_camera_advanced_feature_value_optizoom_on</item>
+ <item>@string/pref_camera_advanced_feature_value_FSSR_on</item>
<item>@string/pref_camera_advanced_feature_value_trueportrait_on</item>
</string-array>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 95a151e3d..40cd2b69c 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -145,6 +145,7 @@
<string name="pref_camera_advanced_feature_entry_refocus">Refocus</string>
<string name="pref_camera_advanced_feature_entry_chromaflash">Chroma Flash</string>
<string name="pref_camera_advanced_feature_entry_optizoom">Opti Zoom</string>
+ <string name="pref_camera_advanced_feature_entry_FSSR">FSSR</string>
<string name="pref_camera_advanced_feature_entry_trueportrait">True Portrait</string>
<!-- Auto exposure entry values. Do not translate. -->
@@ -153,11 +154,13 @@
<string name="pref_camera_advanced_feature_value_refocus_on">re-focus-on</string>
<string name="pref_camera_advanced_feature_value_chromaflash_on">chroma-flash-on</string>
<string name="pref_camera_advanced_feature_value_optizoom_on">opti-zoom-on</string>
+ <string name="pref_camera_advanced_feature_value_FSSR_on">FSSR-on</string>
<string name="pref_camera_advanced_feature_value_trueportrait_on">true-portrait-on</string>
<string name="pref_camera_advanced_feature_value_ubifocus_off">af-bracket-off</string>
<string name="pref_camera_advanced_feature_value_refocus_off">re-focus-off</string>
<string name="pref_camera_advanced_feature_value_chromaflash_off">chroma-flash-off</string>
<string name="pref_camera_advanced_feature_value_optizoom_off">opti-zoom-off</string>
+ <string name="pref_camera_advanced_feature_value_FSSR_off">FSSR-off</string>
<string name="pref_camera_advanced_feature_value_trueportrait_off">true-portrait-off</string>
<!-- Settings screen, ZSL location dialog choices -->
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 2bce3dd22..ad0bbc544 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -121,6 +121,7 @@ public class CameraSettings {
private static final String KEY_QC_SUPPORTED_RE_FOCUS_MODES = "re-focus-values";
private static final String KEY_QC_SUPPORTED_CF_MODES = "chroma-flash-values";
private static final String KEY_QC_SUPPORTED_OZ_MODES = "opti-zoom-values";
+ private static final String KEY_QC_SUPPORTED_FSSR_MODES = "FSSR-values";
private static final String KEY_QC_SUPPORTED_TP_MODES = "true-portrait-values";
private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values";
private static final String KEY_QC_SUPPORTED_DIS_MODES = "dis-values";
@@ -138,6 +139,7 @@ public class CameraSettings {
public static final String KEY_QC_LEGACY_BURST = "snapshot-burst-num";
public static final String KEY_QC_CHROMA_FLASH = "chroma-flash";
public static final String KEY_QC_OPTI_ZOOM = "opti-zoom";
+ public static final String KEY_QC_FSSR = "FSSR";
public static final String KEY_QC_TP = "true-portrait";
public static final String KEY_QC_FACE_RECOGNITION = "face-recognition";
public static final String KEY_QC_DIS_MODE = "dis";
@@ -354,6 +356,7 @@ public class CameraSettings {
String str = params.get(KEY_QC_SUPPORTED_AF_BRACKETING_MODES);
str += ',' + params.get(KEY_QC_SUPPORTED_CF_MODES);
str += ',' + params.get(KEY_QC_SUPPORTED_OZ_MODES);
+ str += ',' + params.get(KEY_QC_SUPPORTED_FSSR_MODES);
str += ',' + params.get(KEY_QC_SUPPORTED_TP_MODES);
str += ',' + mContext.getString(R.string.pref_camera_advanced_feature_default);
str += ',' + params.get(KEY_QC_SUPPORTED_RE_FOCUS_MODES);
@@ -392,6 +395,14 @@ public class CameraSettings {
return split(str);
}
+ public static List<String> getSupportedFSSRModes(Parameters params) {
+ String str = params.get(KEY_QC_SUPPORTED_FSSR_MODES);
+ if (str == null) {
+ return null;
+ }
+ return split(str);
+ }
+
public static List<String> getSupportedTruePortraitModes(Parameters params) {
String str = params.get(KEY_QC_SUPPORTED_TP_MODES);
if (str == null) {
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 21446baa6..deeea89ee 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -330,6 +330,8 @@ public class PhotoMenu extends PieController
pref_camera_advanced_feature_value_chromaflash_on);
String optiZoomOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_optizoom_on);
+ String fssrOn = mActivity.getString(R.string.
+ pref_camera_advanced_feature_value_FSSR_on);
String truePortraitOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_trueportrait_on);
@@ -349,6 +351,7 @@ public class PhotoMenu extends PieController
advancedFeatures.equals(chromaFlashOn) ||
advancedFeatures.equals(reFocusOn) ||
advancedFeatures.equals(optiZoomOn) ||
+ advancedFeatures.equals(fssrOn) ||
advancedFeatures.equals(truePortraitOn))) {
popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false);
popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false);
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 9ff97d5d5..f701fb407 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1576,6 +1576,8 @@ public class PhotoModule
pref_camera_advanced_feature_value_chromaflash_on);
String optiZoomOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_optizoom_on);
+ String fssrOn = mActivity.getString(R.string.
+ pref_camera_advanced_feature_value_FSSR_on);
String truPortraitOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_trueportrait_on);
String optiZoom =
@@ -1584,6 +1586,8 @@ public class PhotoModule
mParameters.get(CameraSettings.KEY_QC_CHROMA_FLASH);
String ubiFocus =
mParameters.get(CameraSettings.KEY_QC_AF_BRACKETING);
+ String fssr =
+ mParameters.get(CameraSettings.KEY_QC_FSSR);
String continuousShot =
mParameters.get("long-shot");
String truePortrait =
@@ -1610,6 +1614,7 @@ public class PhotoModule
(reFocus != null && reFocus.equals(reFocusOn)) ||
(chromaFlash != null && chromaFlash.equals(chromaFlashOn)) ||
(optiZoom != null && optiZoom.equals(optiZoomOn)) ||
+ (fssr != null && fssr.equals(fssrOn)) ||
(truePortrait != null && truePortrait.equals(truPortraitOn))) {
mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO;
flashMode = Parameters.FLASH_MODE_OFF;
@@ -2551,6 +2556,7 @@ public class PhotoModule
String chromaFlash,
String reFocus,
String optiZoom,
+ String fssr,
String truePortrait) {
if (CameraUtil.isSupported(ubiFocus,
CameraSettings.getSupportedAFBracketingModes(mParameters))) {
@@ -2568,6 +2574,10 @@ public class PhotoModule
CameraSettings.getSupportedRefocusModes(mParameters))) {
mParameters.set(CameraSettings.KEY_QC_RE_FOCUS, reFocus);
}
+ if (CameraUtil.isSupported(fssr,
+ CameraSettings.getSupportedFSSRModes(mParameters))) {
+ mParameters.set(CameraSettings.KEY_QC_FSSR, fssr);
+ }
if (CameraUtil.isSupported(truePortrait,
CameraSettings.getSupportedTruePortraitModes(mParameters))) {
mParameters.set(CameraSettings.KEY_QC_TP, truePortrait);
@@ -2801,6 +2811,8 @@ public class PhotoModule
pref_camera_advanced_feature_value_optizoom_off);
String reFocusOff = mActivity.getString(R.string.
pref_camera_advanced_feature_value_refocus_off);
+ String fssrOff = mActivity.getString(R.string.
+ pref_camera_advanced_feature_value_FSSR_off);
String truePortraitOff = mActivity.getString(R.string.
pref_camera_advanced_feature_value_trueportrait_off);
@@ -2810,6 +2822,7 @@ public class PhotoModule
chromaFlashOff,
reFocusOff,
optiZoomOff,
+ fssrOff,
truePortraitOff);
} else if (advancedFeature.equals(mActivity.getString(R.string.
pref_camera_advanced_feature_value_chromaflash_on))) {
@@ -2817,6 +2830,7 @@ public class PhotoModule
advancedFeature,
reFocusOff,
optiZoomOff,
+ fssrOff,
truePortraitOff);
} else if (advancedFeature.equals(mActivity.getString(R.string.
pref_camera_advanced_feature_value_refocus_on))) {
@@ -2824,6 +2838,7 @@ public class PhotoModule
chromaFlashOff,
advancedFeature,
optiZoomOff,
+ fssrOff,
truePortraitOff);
mRefocus = true;
} else if (advancedFeature.equals(mActivity.getString(R.string.
@@ -2832,6 +2847,15 @@ public class PhotoModule
chromaFlashOff,
reFocusOff,
advancedFeature,
+ fssrOff,
+ truePortraitOff);
+ } else if (advancedFeature.equals(mActivity.getString(R.string.
+ pref_camera_advanced_feature_value_FSSR_on))) {
+ qcomUpdateAdvancedFeatures(ubiFocusOff,
+ chromaFlashOff,
+ reFocusOff,
+ optiZoomOff,
+ advancedFeature,
truePortraitOff);
} else if (advancedFeature.equals(mActivity.getString(R.string.
pref_camera_advanced_feature_value_trueportrait_on))) {
@@ -2839,12 +2863,14 @@ public class PhotoModule
chromaFlashOff,
reFocusOff,
optiZoomOff,
+ fssrOff,
advancedFeature);
} else {
qcomUpdateAdvancedFeatures(ubiFocusOff,
chromaFlashOff,
reFocusOff,
optiZoomOff,
+ fssrOff,
truePortraitOff);
}
}