summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorIvan Evlogiev <ivanevlogiev@codeaurora.org>2014-10-07 11:28:03 +0300
committerIvan Evlogiev <ivanevlogiev@codeaurora.org>2014-10-07 11:36:59 +0300
commit9b88eba0cf07fd75dee944daa3cfe998d8153431 (patch)
tree7109d99191ad2d16ce143908e483553ea91487a2 /src/com/android
parent2690a557364b1cfcff49b12eedb40b37e16d9393 (diff)
downloadandroid_packages_apps_Snap-9b88eba0cf07fd75dee944daa3cfe998d8153431.tar.gz
android_packages_apps_Snap-9b88eba0cf07fd75dee944daa3cfe998d8153431.tar.bz2
android_packages_apps_Snap-9b88eba0cf07fd75dee944daa3cfe998d8153431.zip
SanpdragonCamera: Disable continuous shot for advanced capture
- Continuous shot needs to be disabled for continuous capture Change-Id: Id83431cff69da778df8cf815731688e73505b0c3
Diffstat (limited to 'src/com/android')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index f52de79da..2b12432ba 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1525,6 +1525,7 @@ public class PhotoModule
String colorEffect = null;
String exposureCompensation = null;
String touchAfAec = null;
+ boolean disableLongShot = false;
String ubiFocusOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_ubifocus_on);
@@ -1573,6 +1574,9 @@ public class PhotoModule
exposureCompensation, touchAfAec, null,
null, null, null, colorEffect,
sceneMode, redeyeReduction, aeBracketing);
+ disableLongShot = true;
+ Toast.makeText(mActivity, R.string.advanced_capture_disable_continuous_shot,
+ Toast.LENGTH_LONG).show();
}
// If scene mode is set, for flash mode, white balance and focus mode
@@ -1595,8 +1599,7 @@ public class PhotoModule
colorEffect,
sceneMode, redeyeReduction, aeBracketing);
if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) {
- mUI.overrideSettings(CameraSettings.KEY_LONGSHOT,
- mActivity.getString(R.string.setting_off_value));
+ disableLongShot = true;
}
} else if (mFocusManager.isZslEnabled()) {
focusMode = mParameters.getFocusMode();
@@ -1617,7 +1620,10 @@ public class PhotoModule
mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, fMode);
mParameters.setFlashMode(fMode);
}
- if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
+ if (disableLongShot) {
+ mUI.overrideSettings(CameraSettings.KEY_LONGSHOT,
+ mActivity.getString(R.string.setting_off_value));
+ } else {
mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null);
}
}