diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-15 01:28:23 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-15 01:28:23 -0700 |
commit | 0d526ef2eca583d3475709db9bbb03e2f7a2a7ae (patch) | |
tree | 46ce1b2206f1c05c06b8102218436b6b62c1bfa8 /src/com/android | |
parent | c3e3dbad5dda8b83d32cd659855f1ea0d3a7ca2c (diff) | |
parent | df546f6a0b2665d0bbf4ec76387334f6d7fac09b (diff) | |
download | android_packages_apps_Snap-0d526ef2eca583d3475709db9bbb03e2f7a2a7ae.tar.gz android_packages_apps_Snap-0d526ef2eca583d3475709db9bbb03e2f7a2a7ae.tar.bz2 android_packages_apps_Snap-0d526ef2eca583d3475709db9bbb03e2f7a2a7ae.zip |
Merge "SnapdragonCamera: fix camera FC when internal storage isn't enough"
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 80e827cdb..e2fc34b0c 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -795,7 +795,13 @@ public class PhotoModule @Override public void onSwitchSavePath() { - mUI.setPreference(CameraSettings.KEY_CAMERA_SAVEPATH, "1"); + if (mUI.mMenuInitialized) { + mUI.setPreference(CameraSettings.KEY_CAMERA_SAVEPATH, "1"); + } else { + mPreferences.edit() + .putString(CameraSettings.KEY_CAMERA_SAVEPATH, "1") + .apply(); + } RotateTextToast.makeText(mActivity, R.string.on_switch_save_path_to_sdcard, Toast.LENGTH_SHORT).show(); } diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 3f6787902..e7285fa6a 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -932,7 +932,7 @@ public class WideAnglePanoramaModule @Override public void onSwitchSavePath() { - mPreferences.edit().putString(CameraSettings.KEY_CAMERA_SAVEPATH, "1").apply(); + mPreferences.getGlobal().edit().putString(CameraSettings.KEY_CAMERA_SAVEPATH, "1").apply(); RotateTextToast.makeText(mActivity, R.string.on_switch_save_path_to_sdcard, Toast.LENGTH_SHORT).show(); } |