summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-08-03 17:32:10 -0700
committerBruno Martins <bgcngm@gmail.com>2018-11-20 12:31:35 +0000
commit798bfbce372c87c070f78a384518fafd8639adb9 (patch)
tree0fd815262277fb9d3ffb3e00799ce935f5d363a5 /src/com
parent9a5c34da122fb00beb62286cbfc194326cd311fa (diff)
downloadandroid_packages_apps_Snap-798bfbce372c87c070f78a384518fafd8639adb9.tar.gz
android_packages_apps_Snap-798bfbce372c87c070f78a384518fafd8639adb9.tar.bz2
android_packages_apps_Snap-798bfbce372c87c070f78a384518fafd8639adb9.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')
-rw-r--r--src/com/android/camera/PhotoModule.java21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 51c93e5a5..2d524a5b6 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1884,6 +1884,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;
@@ -2088,7 +2107,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) {