Merge "fix print code to support landscape" into gb-ub-photos-carlsbad

[android-x86/packages-apps-Gallery2.git] / res / layout / video_module.xml

diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 790f3eb..2df1adc 100644 (file)
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!-- Copyright (C) 2013 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.
@@ -15,43 +15,46 @@
 -->
 <!-- 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"
+    <TextureView
+        android:id="@+id/preview_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+    <View
+        android:id="@+id/flash_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/white"
+        android:visibility="gone"
+        android:alpha="0" />
+    <FrameLayout android:id="@+id/preview_border"
             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_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: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>
+            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"/>
 
+    <include layout="@layout/camera_controls"
+        android:layout_gravity="center"
+        style="@style/CameraControls"/>
 </merge>