Merge "Use video capture intent quality when recording with effects." into ics-mr0
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 353b540..fa3a9d6 100755
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1682,6 +1682,9 @@
             if (!mIsVideoCaptureIntent) {
                 enableCameraControls(true);
             }
+            // The orientation was fixed during video recording. Now make it
+            // reflect the device orientation as video recording is stopped.
+            setOrientationIndicator(mOrientationCompensation);
             keepScreenOnAwhile();
             if (shouldAddToMediaStoreNow) {
                 addVideoToMediaStore();