diff options
author | Steve Kondik <steve@cyngn.com> | 2016-08-03 17:32:10 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:51 +0200 |
commit | 1c894faa24bb431c43704ca8ae6a7d110dc4d993 (patch) | |
tree | 79a3507471c2b44422c1e20be70637b36d8e410f /src/com/android/camera/PhotoModule.java | |
parent | e7333df6c03e0ca0577fa66a11956c7543e95bdc (diff) | |
download | android_packages_apps_Snap-1c894faa24bb431c43704ca8ae6a7d110dc4d993.tar.gz android_packages_apps_Snap-1c894faa24bb431c43704ca8ae6a7d110dc4d993.tar.bz2 android_packages_apps_Snap-1c894faa24bb431c43704ca8ae6a7d110dc4d993.zip |
snap: Add constrained longshot mode
* On the OP3, we can only use Longshot in a single scene mode without
conflicting with other built-in postprocessing features which cannot
be disabled. Add support for this. When a scene specified in the
longshot-scenemodes list is active, continuous shot will be enabled.
Change-Id: I79878e5ac918e907ddc5b3ca168e49f4e06656c3
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c75d1fd12..dffd98b2a 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1836,6 +1836,25 @@ public class PhotoModule } } + private void updateLongshotScene() { + String[] longshotScenes = mActivity.getResources().getStringArray( + R.array.longshot_scenemodes); + if (longshotScenes.length == 0) { + mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null); + return; + } + boolean useLongshot = false; + for (String scene : longshotScenes) { + if (scene.equals(mSceneMode)) { + useLongshot = true; + break; + } + } + mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, + useLongshot ? mActivity.getString(R.string.setting_on_value) : + mActivity.getString(R.string.setting_off_value)); + } + private void updateCommonManual3ASettings() { String touchAfAec = mParameters.TOUCH_AF_AEC_OFF; mSceneMode = Parameters.SCENE_MODE_AUTO; @@ -2044,7 +2063,7 @@ public class PhotoModule mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, mActivity.getString(R.string.setting_off_value)); } else { - mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null); + updateLongshotScene(); } if(TsMakeupManager.HAS_TS_MAKEUP) { |