commit 2a7f44cac888de5683d05bef5708f846ee950f43
author Doris Liu <tianliu@google.com> Mon Aug 12 15:18:53 2013 -0700
committer Doris Liu <tianliu@google.com> Tue Aug 13 11:22:27 2013 -0700
tree a7cb316a8a385be64c08b0ff9ffcf64fab1281e5
parent 39685480a9705a949275c4b9cb0cca46c6c3cbc4

Fix video capture intent handling

Bug: 10296343

Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435

src/com/android/camera/VideoUI.java

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 5c7eca2..6841796 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -189,7 +189,7 @@
     }
 
     private void initializeControlByIntent() {
-        mMenuButton = mActivity.findViewById(R.id.menu);
+        mMenuButton = mRootView.findViewById(R.id.menu);
         mMenuButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -199,9 +199,9 @@
             }
         });
 
-        mCameraControls = (CameraControls) mActivity.findViewById(R.id.camera_controls);
+        mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls);
         mOnScreenIndicators = new OnScreenIndicators(mActivity,
-                mActivity.findViewById(R.id.on_screen_indicators));
+                mRootView.findViewById(R.id.on_screen_indicators));
         mOnScreenIndicators.resetToDefault();
         if (mController.isVideoCaptureIntent()) {
             hideSwitcher();
@@ -210,9 +210,9 @@
             // Cannot use RotateImageView for "done" and "cancel" button because
             // the tablet layout uses RotateLayout, which cannot be cast to
             // RotateImageView.
-            mReviewDoneButton = mActivity.findViewById(R.id.btn_done);
-            mReviewCancelButton = mActivity.findViewById(R.id.btn_cancel);
-            mReviewPlayButton = mActivity.findViewById(R.id.btn_play);
+            mReviewDoneButton = mRootView.findViewById(R.id.btn_done);
+            mReviewCancelButton = mRootView.findViewById(R.id.btn_cancel);
+            mReviewPlayButton = mRootView.findViewById(R.id.btn_play);
             mReviewCancelButton.setVisibility(View.VISIBLE);
             mReviewDoneButton.setOnClickListener(new OnClickListener() {
                 @Override
@@ -414,7 +414,7 @@
         }
         mGestures.setRenderOverlay(mRenderOverlay);
 
-        mPreviewThumb = mActivity.findViewById(R.id.preview_thumb);
+        mPreviewThumb = mRootView.findViewById(R.id.preview_thumb);
         mPreviewThumb.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -555,7 +555,9 @@
             }
         } else {
             mShutterButton.setImageResource(R.drawable.btn_new_shutter_video);
-            showSwitcher();
+            if (!mController.isVideoCaptureIntent()) {
+                showSwitcher();
+            }
             mRecordingTimeView.setVisibility(View.GONE);
             if (!ApiHelper.HAS_ZOOM_WHEN_RECORDING && zoomSupported) {
                 // TODO: enable zoom UI here.