diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-15 01:28:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-15 01:28:21 -0700 |
| commit | aa70488562dce7c5c5f0e8987b5d2b2b408c95c9 (patch) | |
| tree | 23626009f9882001c6e5df43d708977e1f4568b5 /src/com/android/camera/CameraSettings.java | |
| parent | 2cb1d1e958af8847ea5110391f0dfa5dc2cb4435 (diff) | |
| parent | b0107e34ecf65aabb3435a93dd9fafab85fbc57a (diff) | |
| download | android_packages_apps_Snap-aa70488562dce7c5c5f0e8987b5d2b2b408c95c9.tar.gz android_packages_apps_Snap-aa70488562dce7c5c5f0e8987b5d2b2b408c95c9.tar.bz2 android_packages_apps_Snap-aa70488562dce7c5c5f0e8987b5d2b2b408c95c9.zip | |
Merge "SnapdragonCamera: customize camera picture quality"
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 da4efa1ad..cfc52a7ea 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -994,12 +994,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); @@ -1022,7 +1022,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; @@ -1109,7 +1109,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 |