SnapdragonCamera: Modify video preview UI

Ensure all the unuseful icons are hide when
Show the video preivew UI.

Change-Id: Ia59bb9d50a0d4e2cd8892faa74e6074725c4776e
CRs-Fixed: 1099277

3 files changed, 23 insertions, 14 deletions

diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 2456caf82..56f585787 100644..100755
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -77,19 +77,26 @@
                 android:id="@+id/labels" />
         </LinearLayout>
     </com.android.camera.ui.RotateLayout>
-    <ImageView android:id="@+id/review_image"
-        android:layout_height="match_parent"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:visibility="gone"
-        android:background="@android:color/black"/>
-    <ImageView
-        android:id="@+id/btn_play"
-        style="@style/ReviewControlIcon"
-        android:layout_centerInParent="true"
-        android:src="@drawable/ic_gallery_play_big"
-        android:scaleType="center"
-        android:visibility="gone"
-        android:onClick="onReviewPlayClicked"/>
+        android:layout_height="match_parent">
+        <ImageView android:id="@+id/review_image"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:visibility="gone"
+            android:background="@android:color/black"/>
+
+        <ImageView
+            android:id="@+id/btn_play"
+            style="@style/ReviewControlIcon"
+            android:layout_centerInParent="true"
+            android:src="@drawable/ic_gallery_play_big"
+            android:scaleType="center"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:onClick="onReviewPlayClicked"/>
+    </FrameLayout>
+
     <include layout="@layout/camera_controls"
         android:layout_gravity="center"
         style="@style/CameraControls"/>
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 5ea01c575..f5c432a19 100644..100755
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -142,7 +142,6 @@ public class VideoMenu extends MenuController
                 CameraSettings.KEY_VIDEO_TNR_MODE,
                 CameraSettings.KEY_VIDEO_SNAPSHOT_SIZE
         };
-        mFrontBackSwitcher.setVisibility(View.INVISIBLE);
         initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher);
     }
 
@@ -482,7 +481,6 @@ public class VideoMenu extends MenuController
             resid = pref.getSingleIcon();
         }
         ((ImageView) switcher).setImageResource(resid);
-        switcher.setVisibility(View.VISIBLE);
         mPreferences.add(pref);
         mPreferenceMap.put(pref, switcher);
         switcher.setOnClickListener(new OnClickListener() {
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index e853783a6..3a21a060a 100644..100755
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -1020,6 +1020,8 @@ public class VideoUI implements PieRenderer.PieListener,
         CameraUtil.fadeIn(mReviewPlayButton);
         mReviewImage.setVisibility(View.VISIBLE);
         mMenuButton.setVisibility(View.GONE);
+        mCameraControls.hideUI();
+        mVideoMenu.hideUI();
         mOnScreenIndicators.setVisibility(View.GONE);
     }
 
@@ -1027,6 +1029,8 @@ public class VideoUI implements PieRenderer.PieListener,
         mReviewImage.setVisibility(View.GONE);
         mShutterButton.setEnabled(true);
         mMenuButton.setVisibility(View.VISIBLE);
+        mCameraControls.showUI();
+        mVideoMenu.showUI();
         mOnScreenIndicators.setVisibility(View.VISIBLE);
         CameraUtil.fadeOut(mReviewDoneButton);
         CameraUtil.fadeOut(mReviewPlayButton);