summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rwxr-xr-xsrc/com/android/camera/CameraSettings.java23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 012a22d5e..88488426f 100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -301,6 +301,8 @@ public class CameraSettings {
public static String mKeyIso = null;
public static String mKeyIsoValues = null;
+ private static boolean mSupportBokehMode = false;
+
private static final HashMap<Integer, String>
VIDEO_ENCODER_TABLE = new HashMap<Integer, String>();
public static final HashMap<String, Integer>
@@ -488,6 +490,9 @@ public class CameraSettings {
} else {
Log.d(TAG, "Using key for iso-values: " + mKeyIsoValues);
}
+
+ // Bokeh mode
+ mSupportBokehMode = mContext.getResources().getBoolean(R.bool.support_bokeh_mode);
}
public PreferenceGroup getPreferenceGroup(int preferenceRes) {
@@ -1325,9 +1330,11 @@ public class CameraSettings {
return;
}
-// if (numOfCameras > 2 ) {
-// numOfCameras = 2;
-// }
+ if (!mSupportBokehMode) {
+ if (numOfCameras > 2) {
+ numOfCameras = 2;
+ }
+ }
CharSequence[] entryValues = new CharSequence[numOfCameras];
for (int i = 0; i < numOfCameras; ++i) {
@@ -1672,6 +1679,11 @@ public class CameraSettings {
public static boolean isBokehModeSupported(Parameters params) {
boolean ret = false;
+
+ if (!mSupportBokehMode) {
+ return ret;
+ }
+
if (null != params) {
String val = params.get(KEY_QC_IS_BOKEH_MODE_SUPPORTED);
if ("1".equals(val)) {
@@ -1683,6 +1695,11 @@ public class CameraSettings {
public static boolean isBokehMPOSupported(Parameters params) {
boolean ret = false;
+
+ if (!mSupportBokehMode) {
+ return ret;
+ }
+
if (null != params) {
String val = params.get(KEY_QC_IS_BOKEH_MPO_SUPPORTED);
if ("1".equals(val)) {