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
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index af839e7..6b77737 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -62,7 +62,6 @@
android:layout_width="wrap_content"
android:layout_marginLeft="50dp"
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 cfe3b02..1c82201 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 67bdc26..0c705be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -712,4 +712,6 @@
<string name="pref_camera_video_rotation_label_90">90</string>
<string name="pref_camera_video_rotation_label_180">180</string>
<string name="pref_camera_video_rotation_label_270">270</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 14d59c4..aa56f06 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -200,6 +200,8 @@
mAnimationManager = new AnimationManager();
mOrientationResize = false;
mPrevOrientationResize = false;
+
+ ((ViewGroup)mRootView).removeView(mRecordingTimeRect);
}
public void cameraOrientationPreviewResize(boolean orientation){
@@ -648,15 +650,13 @@
mShutterButton.setImageResource(R.drawable.btn_shutter_video_recording);
hideSwitcher();
mRecordingTimeView.setText("");
- mRecordingTimeView.setVisibility(View.VISIBLE);
- mPauseButton.setVisibility(mIsTimeLapse ? View.GONE : 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);
}
}