SnapdragonCamera: Recording screen to be dynamic

Let the recording rotate layout to be removed by default
and added when it's needed.

Change-Id: I2b910897956b914c150941276b299160e9147055
CRs-Fixed: 958510

4 files changed, 7 insertions, 9 deletions

diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index fa01a6c85..54ba72ebe 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -64,7 +64,6 @@
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="70dp"
                 android:padding="23dp"
-                android:visibility="gone"
                 android:src="@drawable/btn_pause_recording"/>
             <include layout="@layout/viewfinder_labels_video"
                 android:id="@+id/labels" />
diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml
index cfe3b0211..36ea6abe8 100644
--- a/res/layout/viewfinder_labels_video.xml
+++ b/res/layout/viewfinder_labels_video.xml
@@ -21,11 +21,10 @@
     <TextView android:id="@+id/recording_time"
             style="@style/OnViewfinderLabel"
             android:gravity="center"
+            android:text="@string/initial_recording_seconds"
             android:drawableLeft="@drawable/ic_recording_indicator"
-            android:drawablePadding="5dp"
-            android:visibility="gone" />
+            android:drawablePadding="5dp"/>
     <TextView android:id="@+id/time_lapse_label"
             android:text="@string/time_lapse_title"
-            style="@style/OnViewfinderLabel"
-            android:visibility="gone" />
+            style="@style/OnViewfinderLabel"/>
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a676d9c53..8869a72a8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -736,4 +736,5 @@ CHAR LIMIT = NONE] -->
     <string name="pref_camera_video_rotation_label_270">270</string>
 
     <string name="remaining_photos_format">%d left</string>
+    <string name="initial_recording_seconds">00:00</string>
  </resources>
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index b05e7b6e0..f7b0928a2 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -271,6 +271,7 @@ public class VideoUI implements PieRenderer.PieListener,
             mBottomMargin = l / 4 - mTopMargin;
         }
         mCameraControls.setMargins(mTopMargin, mBottomMargin);
+        ((ViewGroup)mRootView).removeView(mRecordingTimeRect);
     }
 
     public void cameraOrientationPreviewResize(boolean orientation){
@@ -918,15 +919,13 @@ public class VideoUI implements PieRenderer.PieListener,
             mShutterButton.setImageResource(R.drawable.shutter_button_video_stop);
             hideSwitcher();
             mRecordingTimeView.setText("");
-            mRecordingTimeView.setVisibility(View.VISIBLE);
-            mPauseButton.setVisibility(View.VISIBLE);
+            ((ViewGroup)mRootView).addView(mRecordingTimeRect);
         } else {
             mShutterButton.setImageResource(R.drawable.btn_new_shutter_video);
             if (!mController.isVideoCaptureIntent()) {
                 showSwitcher();
             }
-            mRecordingTimeView.setVisibility(View.GONE);
-            mPauseButton.setVisibility(View.GONE);
+            ((ViewGroup)mRootView).removeView(mRecordingTimeRect);
         }
     }