Merge "SnapdragpmCamera:Support W+T bokeh feature" into camera.lnx.1.0-dev.1.0

3 files changed, 150 insertions, 2 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 069fb8701..4bd88f755 100644..100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.BitmapFactory;
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Parameters;
@@ -127,6 +128,10 @@ public class CameraSettings {
     public static final String KEY_LONGSHOT = "pref_camera_longshot_key";
     public static final String KEY_INSTANT_CAPTURE = "pref_camera_instant_capture_key";
 
+    public static final String KEY_BOKEH_MODE = "pref_camera_bokeh_mode_key";
+    public static final String KEY_BOKEH_MPO = "pref_camera_bokeh_mpo_key";
+    public static final String KEY_BOKEH_BLUR_VALUE = "pref_camera_bokeh_blur_degree_key";
+
     private static final String KEY_QC_SUPPORTED_AE_BRACKETING_MODES = "ae-bracket-hdr-values";
     private static final String KEY_QC_SUPPORTED_AF_BRACKETING_MODES = "af-bracket-values";
     private static final String KEY_QC_SUPPORTED_RE_FOCUS_MODES = "re-focus-values";
@@ -241,6 +246,14 @@ public class CameraSettings {
     public static final String KEY_QC_SUPPORTED_MANUAL_EXPOSURE_MODES = "manual-exposure-modes";
     public static final String KEY_QC_SUPPORTED_MANUAL_WB_MODES = "manual-wb-modes";
 
+    //Bokeh
+    public static final String KEY_QC_IS_BOKEH_MODE_SUPPORTED = "is-bokeh-supported";
+    public static final String KEY_QC_IS_BOKEH_MPO_SUPPORTED = "is-bokeh-mpo-supported";
+    public static final String KEY_QC_BOKEH_MODE = "bokeh-mode";
+    public static final String KEY_QC_BOKEH_MPO_MODE = "bokeh-mpo-mode";
+    public static final String KEY_QC_SUPPORTED_DEGREES_OF_BLUR = "supported-blur-degrees";
+    public static final String KEY_QC_BOKEH_BLUR_VALUE = "bokeh-blur-value";
+
     public static final String KEY_TS_MAKEUP_UILABLE       = "pref_camera_tsmakeup_key";
     public static final String KEY_TS_MAKEUP_PARAM         = "tsmakeup"; // on/of
     public static final String KEY_TS_MAKEUP_PARAM_WHITEN  = "tsmakeup_whiten"; // 0~100
@@ -686,6 +699,9 @@ public class CameraSettings {
         ListPreference manualExposure = group.findPreference(KEY_MANUAL_EXPOSURE);
         ListPreference manualWB = group.findPreference(KEY_MANUAL_WB);
         ListPreference instantCapture = group.findPreference(KEY_INSTANT_CAPTURE);
+        ListPreference bokehMode = group.findPreference(KEY_BOKEH_MODE);
+        ListPreference bokehMpo = group.findPreference(KEY_BOKEH_MPO);
+        ListPreference bokehBlurDegree = group.findPreference(KEY_BOKEH_BLUR_VALUE);
 
         if (instantCapture != null) {
             if (!isInstantCaptureSupported(mParameters)) {
@@ -693,6 +709,19 @@ public class CameraSettings {
             }
         }
 
+        if (bokehMode != null) {
+            if (!isBokehModeSupported(mParameters)) {
+                removePreference(group, bokehMode.getKey());
+                removePreference(group, bokehBlurDegree.getKey());
+            }
+        }
+
+        if (bokehMpo != null) {
+            if (!isBokehMPOSupported(mParameters)) {
+                removePreference(group, bokehMpo.getKey());
+            }
+        }
+
         if (hdr_need_1x != null) {
             filterUnsupportedOptions(group,
                     hdr_need_1x, getSupportedHDRNeed1x(mParameters));
@@ -1027,6 +1056,10 @@ public class CameraSettings {
             return;
         }
 
+//        if (numOfCameras > 2 ) {
+//            numOfCameras = 2;
+//        }
+
         CharSequence[] entryValues = new CharSequence[numOfCameras];
         for (int i = 0; i < numOfCameras; ++i) {
             entryValues[i] = "" + i;
@@ -1427,4 +1460,35 @@ public class CameraSettings {
         }
         return ret;
     }
+
+    public static boolean isBokehModeSupported(Parameters params) {
+        boolean ret = false;
+        if (null != params) {
+            String val = params.get(KEY_QC_IS_BOKEH_MODE_SUPPORTED);
+            if ("1".equals(val)) {
+                ret = true;
+            }
+        }
+        return ret;
+    }
+
+    public static boolean isBokehMPOSupported(Parameters params) {
+        boolean ret = false;
+        if (null != params) {
+            String val = params.get(KEY_QC_IS_BOKEH_MPO_SUPPORTED);
+            if ("1".equals(val)) {
+                ret = true;
+            }
+        }
+        return ret;
+    }
+
+    public static List<String> getSupportedDegreesOfBlur(Parameters params) {
+        String str = params.get(KEY_QC_SUPPORTED_DEGREES_OF_BLUR);
+        if (str == null) {
+            return null;
+        }
+        Log.d(TAG,"getSupportedDegreesOfBlur str =" +str);
+        return split(str);
+    }
 }
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 991b4a367..99226b2ec 100644..100755
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -233,6 +233,8 @@ public class PhotoMenu extends MenuController
                 CameraSettings.KEY_ADVANCED_FEATURES,
                 CameraSettings.KEY_AE_BRACKET_HDR,
                 CameraSettings.KEY_INSTANT_CAPTURE,
+                CameraSettings.KEY_BOKEH_MODE,
+                CameraSettings.KEY_BOKEH_MPO,
                 CameraSettings.KEY_MANUAL_EXPOSURE,
                 CameraSettings.KEY_MANUAL_WB,
                 CameraSettings.KEY_MANUAL_FOCUS,
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3b7456f2e..feaefd4ea 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -231,6 +231,7 @@ public class PhotoModule
     private ProgressBar brightnessProgressBar;
     // Constant from android.hardware.Camera.Parameters
     private static final String KEY_PICTURE_FORMAT = "picture-format";
+    private SeekBar mBlurDegreeProgressBar;
     private static final String KEY_QC_RAW_PICUTRE_SIZE = "raw-size";
     public static final String PIXEL_FORMAT_JPEG = "jpeg";
 
@@ -594,6 +595,9 @@ public class PhotoModule
         mSensorManager = (SensorManager)(mActivity.getSystemService(Context.SENSOR_SERVICE));
 
         brightnessProgressBar = (ProgressBar)mRootView.findViewById(R.id.progress);
+        mBlurDegreeProgressBar = (SeekBar)mRootView.findViewById(R.id.blur_degree_bar);
+        mBlurDegreeProgressBar.setOnSeekBarChangeListener(mBlurDegreeListener);
+        mBlurDegreeProgressBar.setMax(100);
         if (brightnessProgressBar instanceof SeekBar) {
             SeekBar seeker = (SeekBar) brightnessProgressBar;
             seeker.setOnSeekBarChangeListener(mSeekListener);
@@ -1554,7 +1558,7 @@ public class PhotoModule
 
     private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
         public void onStartTrackingTouch(SeekBar bar) {
-        // no support
+            // no support
         }
         public void onProgressChanged(SeekBar bar, int progress, boolean fromtouch) {
         }
@@ -1562,6 +1566,24 @@ public class PhotoModule
         }
     };
 
+    private OnSeekBarChangeListener mBlurDegreeListener = new OnSeekBarChangeListener() {
+        public void onStartTrackingTouch(SeekBar bar) {
+        }
+        public void onProgressChanged(SeekBar bar, int progress, boolean fromtouch) {
+            if (mPreferenceGroup != null) {
+                ListPreference blurValue =  mPreferenceGroup.findPreference(
+                        CameraSettings.KEY_BOKEH_BLUR_VALUE);
+                if (blurValue != null) {
+                    blurValue.setValue(""+progress);
+                }
+            }
+            mParameters.set(CameraSettings.KEY_QC_BOKEH_BLUR_VALUE, progress);
+            Log.d(TAG,"seekbar bokeh degree = "+ progress);
+        }
+        public void onStopTrackingTouch(SeekBar bar) {
+        }
+    };
+
     private final class AutoFocusCallback implements CameraAFCallback {
         @Override
         public void onAutoFocus(
@@ -3625,7 +3647,6 @@ public class PhotoModule
                 + mInstantCaptureSnapShot);
         mParameters.set(CameraSettings.KEY_QC_INSTANT_CAPTURE, instantCapture);
 
-
         //Set Histogram
         String histogram = mPreferences.getString(
                 CameraSettings.KEY_HISTOGRAM,
@@ -3669,6 +3690,67 @@ public class PhotoModule
             !mFocusManager.isFocusCompleted()) {
             mUI.clearFocus();
         }
+
+        String bokehMode = mPreferences.getString(
+                CameraSettings.KEY_BOKEH_MODE,
+                mActivity.getString(R.string.pref_camera_bokeh_mode_default));
+        String bokehMpo = mPreferences.getString(
+                CameraSettings.KEY_BOKEH_MPO,
+                mActivity.getString(R.string.pref_camera_bokeh_mpo_default));
+        String bokehBlurDegree = mPreferences.getString(
+                CameraSettings.KEY_BOKEH_BLUR_VALUE,
+                mActivity.getString(R.string.pref_camera_bokeh_blur_degree_default));
+        CameraSettings.getSupportedDegreesOfBlur(mParameters);
+
+        if (!bokehMode.equals(mActivity.getString(
+                R.string.pref_camera_bokeh_mode_entry_value_disable))) {
+            if(!zsl.equals("on")) {
+                mParameters.setZSLMode("on");
+            }
+            if(mParameters.getSceneMode() != Parameters.SCENE_MODE_AUTO) {
+                mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO);
+            }
+            if(mParameters.getFlashMode() != Parameters.FLASH_MODE_OFF) {
+                mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
+            }
+            if(mParameters.get("long-shot").equals(mActivity.getString(R.string.setting_on_value))) {
+                mParameters.set("long-shot",mActivity.getString(R.string.setting_off_value));
+            }
+            if(mManual3AEnabled != 0) {
+                mManual3AEnabled = 0;
+            }
+            mActivity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mUI.overrideSettings(CameraSettings.KEY_SCENE_MODE,
+                            mActivity.getString(R.string.pref_camera_scenemode_default));
+                    mUI.overrideSettings(CameraSettings.KEY_ZSL,
+                            mActivity.getString(R.string.pref_camera_zsl_value_on));
+                    mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, "off");
+                    mUI.overrideSettings(CameraSettings.KEY_LONGSHOT,
+                            mActivity.getString(R.string.pref_camera_longshot_default));
+                    mBlurDegreeProgressBar.setVisibility(View.VISIBLE);
+                    mBlurDegreeProgressBar.setProgress(50);
+                }
+            });
+            mParameters.set(CameraSettings.KEY_QC_BOKEH_MODE, bokehMode);
+            mParameters.set(CameraSettings.KEY_QC_BOKEH_MPO_MODE, bokehMpo);
+            mParameters.set(CameraSettings.KEY_QC_BOKEH_BLUR_VALUE, bokehBlurDegree);
+
+        } else {
+            mActivity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mUI.overrideSettings(CameraSettings.KEY_BOKEH_MPO,
+                            mActivity.getString(R.string.pref_camera_bokeh_mpo_default));
+                    mUI.overrideSettings(CameraSettings.KEY_BOKEH_BLUR_VALUE,
+                            mActivity.getString(R.string.pref_camera_bokeh_blur_degree_default));
+                    mBlurDegreeProgressBar.setVisibility(View.GONE);
+                }
+            });
+        }
+        Log.v(TAG, "Bokeh Mode = " + bokehMode + " bokehMpo = " + bokehMpo +
+                " bokehBlurDegree = " + bokehBlurDegree);
     }
 
     private int estimateJpegFileSize(final Size size, final String quality) {