Switch over to use new camera activity

[android-x86/packages-apps-Camera2.git] / res / layout / photo_module.xml

diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index abf094e..70a7579 100644 (file)
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -24,8 +24,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center">
-    <include layout="@layout/count_down_to_capture"/>
-
+    <TextureView
+        android:id="@+id/preview_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
     <ViewStub android:id="@+id/face_view_stub"
         android:inflatedId="@+id/face_view"
         android:layout="@layout/face_view"
@@ -36,4 +38,7 @@
         android:id="@+id/render_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+    <include layout="@layout/camera_controls"
+        android:layout_gravity="center"
+        style="@style/CameraControls"/>
 </merge>
\ No newline at end of file