diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-06 06:07:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-06 06:07:37 -0700 |
| commit | a8ff1d2afa98967e3406b66bb4992f63ab65b0f9 (patch) | |
| tree | 466b64155727b6d71d26eee12591a6857a06992d /src | |
| parent | 93da7df4ef0a6e495c771796f888c50bf3f2de86 (diff) | |
| parent | 4397118f855a8779b0b6030663faa471aada8cff (diff) | |
| download | android_packages_apps_Snap-a8ff1d2afa98967e3406b66bb4992f63ab65b0f9.tar.gz android_packages_apps_Snap-a8ff1d2afa98967e3406b66bb4992f63ab65b0f9.tar.bz2 android_packages_apps_Snap-a8ff1d2afa98967e3406b66bb4992f63ab65b0f9.zip | |
Merge "Camera2: Make continuous shot only support jpeg format picture"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a6f8fb239..9cef6fb1b 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1398,6 +1398,8 @@ public class PhotoModule String ubiFocusOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_ubifocus_on); + String continuousShotOn = + mActivity.getString(R.string.setting_on_value); String chromaFlashOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_chromaflash_on); String optiZoomOn = mActivity.getString(R.string. @@ -1408,7 +1410,16 @@ public class PhotoModule mParameters.get(CameraSettings.KEY_QC_CHROMA_FLASH); String ubiFocus = mParameters.get(CameraSettings.KEY_QC_AF_BRACKETING); + String continuousShot = + mParameters.get("long-shot"); + if ((continuousShot != null) && continuousShot.equals(continuousShotOn)) { + String pictureFormat = mActivity.getString(R.string. + pref_camera_picture_format_value_jpeg); + mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, pictureFormat); + } else { + mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, null); + } if ((ubiFocus != null && ubiFocus.equals(ubiFocusOn)) || (chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || (optiZoom != null && optiZoom.equals(optiZoomOn))) { |