diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2017-08-07 05:49:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-07 05:49:09 -0700 |
| commit | 7258fc41030eb1ccb56a9e5619b9e2d13bd43696 (patch) | |
| tree | 1cfbb10d59c8c4360363b910032e80b301e251a0 /src/com/android/camera/PhotoModule.java | |
| parent | dee06291f589642c8ebe2942160118f327006eca (diff) | |
| parent | 1d5a27e190b75e3ec637e471fd01480c658371ee (diff) | |
| download | android_packages_apps_Snap-7258fc41030eb1ccb56a9e5619b9e2d13bd43696.tar.gz android_packages_apps_Snap-7258fc41030eb1ccb56a9e5619b9e2d13bd43696.tar.bz2 android_packages_apps_Snap-7258fc41030eb1ccb56a9e5619b9e2d13bd43696.zip | |
Merge "SnapdragonCamera:Disalbe options in RTB" into camera.lnx.3.0-dev
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rwxr-xr-x | src/com/android/camera/PhotoModule.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 1cc72af6d..5950719dc 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2160,7 +2160,7 @@ public class PhotoModule flashMode = Parameters.FLASH_MODE_OFF; mParameters.setFlashMode(flashMode); } - if (disableLongShot) { + if (disableLongShot || mIsBokehMode) { mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, mActivity.getString(R.string.setting_off_value)); } else { @@ -2206,6 +2206,11 @@ public class PhotoModule mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, "off"); } } + + if (mIsBokehMode) { + mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, Parameters.FLASH_MODE_OFF); + mUI.overrideSettings(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO); + } } private void overrideCameraSettings(final String flashMode, @@ -3882,13 +3887,6 @@ public class PhotoModule 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)); mUI.getBokehDegreeBar().setProgress(degree); mUI.getBokehDegreeBar().setOnSeekBarChangeListener(mBlurDegreeListener); mUI.enableBokehRender(true); |