diff options
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 67c2325f6..c2d00b562 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2288,6 +2288,11 @@ public class PhotoModule @Override public void onResumeBeforeSuper() { mPaused = false; + mPreferences = new ComboPreferences(mActivity); + CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity); + mCameraId = getPreferredCameraId(mPreferences); + mPreferences.setLocalId(mActivity, mCameraId); + CameraSettings.upgradeLocalPreferences(mPreferences.getLocal()); } private void openCamera() { @@ -2334,6 +2339,7 @@ public class PhotoModule Log.v(TAG, "On resume."); onResumeTasks(); } + mUI.setSwitcherIndex(); mHandler.post(new Runnable(){ @Override public void run(){ @@ -3021,6 +3027,7 @@ public class PhotoModule if (CameraUtil.isSupported(colorEffect, mParameters.getSupportedColorEffects())) { mParameters.setColorEffect(colorEffect); } + //Set Saturation String saturationStr = getSaturationSafe(); if (saturationStr != null) { |