diff options
| author | likaid <likaid@codeaurora.org> | 2015-04-01 15:41:53 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-09 21:58:39 -0700 |
| commit | 4a1570312fb4329cf0d55b2771437a44942b8352 (patch) | |
| tree | 35bd9071fcac6015fbc45adb2ec617409ac99c74 /src/com/android/camera/CameraSettings.java | |
| parent | daf31ffbf9af98c5fe161a2b6f744e239203dc85 (diff) | |
| download | android_packages_apps_Snap-4a1570312fb4329cf0d55b2771437a44942b8352.tar.gz android_packages_apps_Snap-4a1570312fb4329cf0d55b2771437a44942b8352.tar.bz2 android_packages_apps_Snap-4a1570312fb4329cf0d55b2771437a44942b8352.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 2bab3e436..702518736 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -983,12 +983,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); @@ -1011,7 +1011,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; @@ -1098,7 +1098,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 |