summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-05-21 05:04:02 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-05-21 05:04:02 -0700
commit57a2c2d75b90125dfcfad432821bf81d908fd833 (patch)
tree01634278b4c899fbd0d78b806d183305bf6fe0e0
parent4981abb118ff6730b653eaeebf61a682f3e5a89d (diff)
parent8eacbeabfba0f2e934bbb0b6d0a595423f1b10d7 (diff)
downloadandroid_packages_apps_Snap-57a2c2d75b90125dfcfad432821bf81d908fd833.tar.gz
android_packages_apps_Snap-57a2c2d75b90125dfcfad432821bf81d908fd833.tar.bz2
android_packages_apps_Snap-57a2c2d75b90125dfcfad432821bf81d908fd833.zip
Merge "Camera: Send long shot UI button status to native drivers."
-rw-r--r--src/com/android/camera/PhotoModule.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 01e3bd4f3..b8ab9b8ac 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2303,6 +2303,11 @@ public class PhotoModule
//Set Brightness.
mParameters.set("luma-adaptation", String.valueOf(mbrightness));
+ String longshot_enable = mPreferences.getString(
+ CameraSettings.KEY_LONGSHOT,
+ mActivity.getString(R.string.pref_camera_longshot_default));
+ mParameters.set("long-shot", longshot_enable);
+
if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) ||
CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) {
// Set Touch AF/AEC parameter.