diff options
| author | Camera Software Integration <camswint@localhost> | 2016-07-01 06:39:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-01 06:39:08 -0700 |
| commit | ae350a4044fd1c485123ba47f4c250d74680a38f (patch) | |
| tree | 7c35e9a80948efbb26e485b5bd242228c795e44f | |
| parent | e6f2656b1b59abb679e7e06b45b7276843389d99 (diff) | |
| parent | 9516a87261fe152cd2e2df29af76d78757d09258 (diff) | |
| download | android_packages_apps_Snap-ae350a4044fd1c485123ba47f4c250d74680a38f.tar.gz android_packages_apps_Snap-ae350a4044fd1c485123ba47f4c250d74680a38f.tar.bz2 android_packages_apps_Snap-ae350a4044fd1c485123ba47f4c250d74680a38f.zip | |
Merge "SnapdragonCamera: read jpeg quality from settings before setting." into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 5178d49d2..baace39f2 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -173,7 +173,6 @@ public class CaptureModule implements CameraModule, PhotoController, private boolean mAutoExposureRegionSupported; // The degrees of the device rotated clockwise from its natural orientation. private int mOrientation = OrientationEventListener.ORIENTATION_UNKNOWN; - private int mJpegQuality; private boolean mFirstTimeInitialized; private boolean mInitialized = false; private boolean mIsLinked = false; @@ -1996,7 +1995,9 @@ public class CaptureModule implements CameraModule, PhotoController, } private void applyJpegQuality(CaptureRequest.Builder request) { - request.set(CaptureRequest.JPEG_QUALITY, (byte) mJpegQuality); + String value = mSettingsManager.getValue(SettingsManager.KEY_JPEG_QUALITY); + int jpegQuality = getQualityNumber(value); + request.set(CaptureRequest.JPEG_QUALITY, (byte) jpegQuality); } private void applyAFRegions(CaptureRequest.Builder request, int id) { @@ -2217,7 +2218,6 @@ public class CaptureModule implements CameraModule, PhotoController, mActivity.updateStorageSpaceAndHint(); continue; case SettingsManager.KEY_JPEG_QUALITY: - mJpegQuality = getQualityNumber(value); estimateJpegFileSize(); continue; case SettingsManager.KEY_CAMERA2: |