diff options
-rwxr-xr-x[-rw-r--r--] | res/layout/photo_module.xml | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | res/values/qcomarrays.xml | 48 | ||||
-rwxr-xr-x[-rw-r--r--] | res/values/qcomstrings.xml | 17 | ||||
-rwxr-xr-x[-rw-r--r--] | res/xml/camera_preferences.xml | 22 | ||||
-rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CameraSettings.java | 64 | ||||
-rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PhotoMenu.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 86 |
7 files changed, 253 insertions, 2 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 2e3fb8aa0..c55433b3f 100644..100755 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -108,4 +108,20 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> + <FrameLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_gravity="bottom"> + <SeekBar + style="?android:attr/seekBarStyle" + android:id="@+id/blur_degree_bar" + android:orientation="horizontal" + android:layout_gravity="bottom" + android:paddingBottom="80dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="30dip" + android:layout_marginLeft="30dip" + android:layout_marginRight="30dip" /> + </FrameLayout> </merge> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 5a7f7a309..02b4fbed2 100644..100755 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -862,5 +862,53 @@ <item>@string/pref_camera_instant_capture_value_fast_aec</item> <item>@string/pref_camera_instant_capture_value_disable</item> </string-array> + + <string-array name="pref_camera_bokeh_mode_entries" translatable="true"> + <item>@string/pref_camera_bokeh_mode_entry_enable</item> + <item>@string/pref_camera_bokeh_mode_entry_disable</item> + </string-array> + + <string-array name="pref_camera_bokeh_mode_entry_values" translatable="false"> + <item>@string/pref_camera_bokeh_mode_entry_value_enable</item> + <item>@string/pref_camera_bokeh_mode_entry_value_disable</item> + </string-array> + + <string-array name="pref_camera_bokeh_mpo_entries" translatable="true"> + <item>@string/pref_camera_bokeh_mpo_entry_enable</item> + <item>@string/pref_camera_bokeh_mpo_entry_disable</item> + </string-array> + + <string-array name="pref_camera_bokeh_mpo_entry_values" translatable="false"> + <item>@string/pref_camera_bokeh_mpo_entry_value_enable</item> + <item>@string/pref_camera_bokeh_mpo_entry_value_disable</item> + </string-array> + + <string-array name="pref_camera_bokeh_blur_degree_entries" translatable="true"> + <item>0</item> + <item>10</item> + <item>20</item> + <item>30</item> + <item>40</item> + <item>50</item> + <item>60</item> + <item>70</item> + <item>80</item> + <item>90</item> + <item>100</item> + </string-array> + + <string-array name="pref_camera_bokeh_blur_degree_entry_values" translatable="false"> + <item>0</item> + <item>10</item> + <item>20</item> + <item>30</item> + <item>40</item> + <item>50</item> + <item>60</item> + <item>70</item> + <item>80</item> + <item>90</item> + <item>100</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 3ceaf93f1..1693a88c6 100644..100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1130,5 +1130,22 @@ <string name="pref_camera2_auto_hdr_default" translatable="false">disable</string> <string name="pref_camera2_auto_hdr_entry_enable" translatable="true">Enable</string> <string name="pref_camera2_auto_hdr_entry_disable" translatable="true">Disable</string> + + <string name="pref_camera_bokeh_mode_default" translatable="false">0</string> + <string name="pref_camera_bokeh_mode_title" translatable="true">Bokeh Mode</string> + <string name="pref_camera_bokeh_mode_entry_enable" translatable="true">Enable</string> + <string name="pref_camera_bokeh_mode_entry_disable" translatable="true">Disable</string> + <string name="pref_camera_bokeh_mode_entry_value_enable" translatable="false">1</string> + <string name="pref_camera_bokeh_mode_entry_value_disable" translatable="false">0</string> + + <string name="pref_camera_bokeh_mpo_default" translatable="false">0</string> + <string name="pref_camera_bokeh_mpo_title" translatable="true">Bokeh Mode MPO</string> + <string name="pref_camera_bokeh_mpo_entry_enable" translatable="true">Enable</string> + <string name="pref_camera_bokeh_mpo_entry_disable" translatable="true">Disable</string> + <string name="pref_camera_bokeh_mpo_entry_value_enable" translatable="false">1</string> + <string name="pref_camera_bokeh_mpo_entry_value_disable" translatable="false">0</string> + + <string name="pref_camera_bokeh_blur_degree_default" translatable="false">50</string> + <string name="pref_camera_bokeh_blur_degree_title" translatable="true">Bokeh Blur Value</string> </resources> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index a9540550b..ac723f92f 100644..100755 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -381,6 +381,28 @@ camera:entryValues="@array/pref_camera_instant_capture_entry_values" /> <ListPreference + camera:key="pref_camera_bokeh_mode_key" + camera:defaultValue="@string/pref_camera_bokeh_mode_default" + camera:title="@string/pref_camera_bokeh_mode_title" + camera:entries="@array/pref_camera_bokeh_mode_entries" + camera:entryValues="@array/pref_camera_bokeh_mode_entry_values" /> + + <ListPreference + camera:key="pref_camera_bokeh_mpo_key" + camera:defaultValue="@string/pref_camera_bokeh_mpo_default" + camera:title="@string/pref_camera_bokeh_mpo_title" + camera:entries="@array/pref_camera_bokeh_mpo_entries" + camera:entryValues="@array/pref_camera_bokeh_mpo_entry_values" /> + + <ListPreference + camera:key="pref_camera_bokeh_blur_degree_key" + camera:defaultValue="@string/pref_camera_bokeh_blur_degree_default" + camera:title="@string/pref_camera_bokeh_blur_degree_title" + camera:entries="@array/pref_camera_bokeh_blur_degree_entries" + camera:entryValues="@array/pref_camera_bokeh_blur_degree_entry_values" /> + + + <ListPreference camera:key="pref_camera2_camera2_key" camera:defaultValue="@string/setting_off_value" camera:title="@string/pref_camera2_camera2_title" 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 ecdae4dd3..021a26c16 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) { |