diff options
| author | likaid <likaid@codeaurora.org> | 2015-04-01 15:41:53 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2015-04-08 09:14:19 +0800 |
| commit | b0107e34ecf65aabb3435a93dd9fafab85fbc57a (patch) | |
| tree | d0989950786c33ede481359ab2f50176dbb83706 /src/com/android/camera/CameraSettings.java | |
| parent | 8a9196e8f26a7d657167df1ec9d3c9470f107e19 (diff) | |
| download | android_packages_apps_Snap-b0107e34ecf65aabb3435a93dd9fafab85fbc57a.tar.gz android_packages_apps_Snap-b0107e34ecf65aabb3435a93dd9fafab85fbc57a.tar.bz2 android_packages_apps_Snap-b0107e34ecf65aabb3435a93dd9fafab85fbc57a.zip | |
SnapdragonCamera: customize camera picture quality
regional feature
Change-Id: I4c80b4970ff4f628080cad20980aa545add6fdcf
CRs-Fixed: 815630
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index fd7274e52..a92f42258 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -969,12 +969,12 @@ public class CameraSettings { editor.apply(); } - public static void upgradeGlobalPreferences(SharedPreferences pref) { - upgradeOldVersion(pref); + public static void upgradeGlobalPreferences(SharedPreferences pref, Context context) { + upgradeOldVersion(pref, context); upgradeCameraId(pref); } - private static void upgradeOldVersion(SharedPreferences pref) { + private static void upgradeOldVersion(SharedPreferences pref, Context context) { int version; try { version = pref.getInt(KEY_VERSION, 0); @@ -997,7 +997,7 @@ public class CameraSettings { } else if (quality.equals("75")) { quality = "fine"; } else { - quality = "superfine"; + quality = context.getString(R.string.pref_camera_jpegquality_default); } editor.putString(KEY_JPEG_QUALITY, quality); version = 2; @@ -1084,7 +1084,7 @@ public class CameraSettings { // we may write the preference to wrong camera later. preferences.setLocalId(context, currentCameraId); - upgradeGlobalPreferences(preferences.getGlobal()); + upgradeGlobalPreferences(preferences.getGlobal(), context); upgradeLocalPreferences(preferences.getLocal()); // Write back the current camera id because parameters are related to |