From 45769aed47ada21e89084f6fd624700183ed185f Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 3 Aug 2016 17:32:10 -0700 Subject: 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 --- src/com/android/camera/PhotoModule.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8db4d2e5c..081eb7b9e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1754,6 +1754,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() { mSceneMode = Parameters.SCENE_MODE_AUTO; String flashMode = Parameters.FLASH_MODE_OFF; @@ -1961,7 +1980,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 (flashMode == null) { -- cgit v1.2.3