Update scene mode affected settings during initialization.

Change-Id: I41e8b0e7e48658c56f0bcc1a4c0842b946feffe2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 9e4700c..10e9b5d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1108,6 +1108,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
             mControlPanel.setListener(new MyControlPanelListener());
             mPopupGestureDetector = new GestureDetector(this,
                     new PopupGestureListener());
+            updateSceneModeUI();
         }
     }
 
@@ -1932,8 +1933,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
             Log.w(TAG, "invalid exposure: " + exposure);
         }
 
-        updateSceneModeUI();
-
         if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
             // Set flash mode.
             String flashMode = mPreferences.getString(
@@ -2013,6 +2012,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
             return;
         } else if (isCameraIdle()) {
             setCameraParameters(mUpdateSet);
+            updateSceneModeUI();
             mUpdateSet = 0;
         } else {
             if (!mHandler.hasMessages(SET_CAMERA_PARAMETERS_WHEN_IDLE)) {