diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-04-19 04:20:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-04-19 04:20:21 -0700 |
| commit | 1d0766f9070d28996e2e69521793313105443a91 (patch) | |
| tree | 7d0f968c5f3546f21105533b9addcdf8322ea6a3 /src/com/android/camera/PhotoMenu.java | |
| parent | 38a47e5976d3a8d2692abc6f7ea31666c8c771fe (diff) | |
| parent | b9680030697927c15aa68034e96692782db6034d (diff) | |
| download | android_packages_apps_Snap-1d0766f9070d28996e2e69521793313105443a91.tar.gz android_packages_apps_Snap-1d0766f9070d28996e2e69521793313105443a91.tar.bz2 android_packages_apps_Snap-1d0766f9070d28996e2e69521793313105443a91.zip | |
Merge "Camera2: fix the picture format not update problem"
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index dc58c5287..aa0736f4a 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -97,7 +97,6 @@ public class PhotoMenu extends PieController CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_PICTURE_SIZE, CameraSettings.KEY_HISTOGRAM, - CameraSettings.KEY_PICTURE_FORMAT, CameraSettings.KEY_JPEG_QUALITY, CameraSettings.KEY_ZSL, CameraSettings.KEY_TIMER, @@ -111,6 +110,7 @@ public class PhotoMenu extends PieController CameraSettings.KEY_FACE_RECOGNITION, CameraSettings.KEY_TOUCH_AF_AEC, CameraSettings.KEY_SELECTABLE_ZONE_AF, + CameraSettings.KEY_PICTURE_FORMAT, CameraSettings.KEY_SATURATION, CameraSettings.KEY_CONTRAST, CameraSettings.KEY_SHARPNESS, |