Update indicators at the right time to show the correct state.

  Bug: 10620907

Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5

1 files changed, 11 insertions, 5 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 89f229abd..2173c9fb2 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -380,8 +380,6 @@ public class VideoModule implements CameraModule,
 
         initializeVideoControl();
         mPendingSwitchCameraId = -1;
-        mUI.updateOnScreenIndicators(mParameters, mPreferences);
-
     }
 
     // SingleTapListener
@@ -654,8 +652,9 @@ public class VideoModule implements CameraModule,
 
     @Override
     public void onResumeAfterSuper() {
-        if (mOpenCameraFail || mCameraDisabled)
+        if (mOpenCameraFail || mCameraDisabled) {
             return;
+        }
         mUI.enableShutter(false);
         mZoomValue = 0;
 
@@ -1567,6 +1566,9 @@ public class VideoModule implements CameraModule,
         mCameraDevice.setParameters(mParameters);
         // Keep preview size up to date.
         mParameters = mCameraDevice.getParameters();
+
+        // Update UI based on the new parameters.
+        mUI.updateOnScreenIndicators(mParameters, mPreferences);
     }
 
     @Override
@@ -1592,7 +1594,9 @@ public class VideoModule implements CameraModule,
     @Override
     public void onSharedPreferenceChanged() {
         // ignore the events after "onPause()" or preview has not started yet
-        if (mPaused) return;
+        if (mPaused) {
+            return;
+        }
         synchronized (mPreferences) {
             // If mCameraDevice is not ready then we can set the parameter in
             // startPreview().
@@ -1625,7 +1629,9 @@ public class VideoModule implements CameraModule,
     }
 
     private void switchCamera() {
-        if (mPaused) return;
+        if (mPaused)  {
+            return;
+        }
 
         Log.d(TAG, "Start to switch camera.");
         mCameraId = mPendingSwitchCameraId;