Flatten view hierarchy and rotate views

TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)

TODO: Need to cancel capture animation in onConfigurationChanged()

Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf

1 files changed, 57 insertions, 0 deletions

diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
new file mode 100644
index 000000000..790f3eb91
--- /dev/null
+++ b/res/layout/video_module.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- This layout is shared by phone and tablet in landscape orientation. -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/camera_app_root"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+    <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_gravity="center">
+        <com.android.camera.ui.PreviewSurfaceView
+                android:id="@+id/preview_surface_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"/>
+        <FrameLayout android:id="@+id/preview_border"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"
+                android:background="@drawable/ic_snapshot_border" />
+        <com.android.camera.ui.RenderOverlay
+            android:id="@+id/render_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+        <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"
+                style="@style/ViewfinderLabelLayout">
+            <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" />
+        </com.android.camera.ui.RotateLayout>
+        <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:visibility="gone"
+                android:onClick="onReviewPlayClicked"/>
+    </com.android.camera.PreviewFrameLayout>
+
+</merge>