diff options
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 12 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 12 |
4 files changed, 33 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d6caf7eb8..6941b67b0 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -544,7 +544,10 @@ public class PhotoModule } public void reinit() { - mPreferences = new ComboPreferences(mActivity); + mPreferences = ComboPreferences.get(mActivity); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mActivity); + } CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity); mCameraId = getPreferredCameraId(mPreferences); mPreferences.setLocalId(mActivity, mCameraId); @@ -555,7 +558,11 @@ public class PhotoModule public void init(CameraActivity activity, View parent) { mActivity = activity; mRootView = parent; - mPreferences = new ComboPreferences(mActivity); + mPreferences = ComboPreferences.get(mActivity); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mActivity); + } + CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity); mCameraId = getPreferredCameraId(mPreferences); diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index ff31e9f8b..a5b72488c 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -104,7 +104,10 @@ public class SettingsManager implements ListMenu.SettingsListener { mListeners = new ArrayList<>(); mCharacteristics = new ArrayList<>(); mContext = context; - mPreferences = new ComboPreferences(mContext); + mPreferences = ComboPreferences.get(mContext); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mContext); + } CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mContext); CameraManager manager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 96423044f..9cb48eb0f 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -453,7 +453,11 @@ public class VideoModule implements CameraModule, } public void reinit() { - mPreferences = new ComboPreferences(mActivity); + mPreferences = ComboPreferences.get(mActivity); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mActivity); + } + CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity); mCameraId = getPreferredCameraId(mPreferences); mPreferences.setLocalId(mActivity, mCameraId); @@ -464,7 +468,11 @@ public class VideoModule implements CameraModule, public void init(CameraActivity activity, View root) { mActivity = activity; mUI = new VideoUI(activity, this, root); - mPreferences = new ComboPreferences(mActivity); + mPreferences = ComboPreferences.get(mActivity); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mActivity); + } + CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity); mCameraId = getPreferredCameraId(mPreferences); diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 9a0e9ce7e..3f825dd39 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -301,7 +301,11 @@ public class WideAnglePanoramaModule mDialogPanoramaFailedString = appRes.getString(R.string.pano_dialog_panorama_failed); mDialogWaitingPreviousString = appRes.getString(R.string.pano_dialog_waiting_previous); - mPreferences = new ComboPreferences(mActivity); + mPreferences = ComboPreferences.get(mActivity); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mActivity); + } + mPreferences.setLocalId(mActivity, getPreferredCameraId(mPreferences)); CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity); mLocationManager = new LocationManager(mActivity, null); @@ -960,7 +964,11 @@ public class WideAnglePanoramaModule @Override public void onResumeBeforeSuper() { mPaused = false; - mPreferences = new ComboPreferences(mActivity); + mPreferences = ComboPreferences.get(mActivity); + if (mPreferences == null) { + mPreferences = new ComboPreferences(mActivity); + } + CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity); mPreferences.setLocalId(mActivity, getPreferredCameraId(mPreferences)); CameraSettings.upgradeLocalPreferences(mPreferences.getLocal()); |