diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-05-31 09:26:50 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-05-30 18:28:50 -0700 |
| commit | 4397118f855a8779b0b6030663faa471aada8cff (patch) | |
| tree | b8d8b293246bfbe8f344c6dff10d0e267fc36fcc /src | |
| parent | df53f1cb34d73076500b51d221f5a5d7171818ba (diff) | |
| download | android_packages_apps_Snap-4397118f855a8779b0b6030663faa471aada8cff.tar.gz android_packages_apps_Snap-4397118f855a8779b0b6030663faa471aada8cff.tar.bz2 android_packages_apps_Snap-4397118f855a8779b0b6030663faa471aada8cff.zip | |
Camera2: Make continuous shot only support jpeg format picture
When click continuous shot, other format picture can also be
chosen.
Modify to acheive that when we click continuous shot,the picutre
format can only be jpeg format.
CRs-fixed: 671041
Change-Id: Ifb99342bff3715ea0ab1eb1061b02d342d7574e9
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 c71cb4d84..b68f718e8 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))) { |