summaryrefslogtreecommitdiffstats
path: root/res/layout/video_module.xml
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-13 23:27:35 -0800
committerSteve Kondik <steve@cyngn.com>2016-11-13 23:33:37 -0800
commit302dfef488297152978788c2341cd3460727b251 (patch)
treee505947a46b291f22f1ee625ff82ebbec528353b /res/layout/video_module.xml
parent7f040079cb93d6b5180147cd369e73d43078c91a (diff)
downloadandroid_packages_apps_Snap-302dfef488297152978788c2341cd3460727b251.tar.gz
android_packages_apps_Snap-302dfef488297152978788c2341cd3460727b251.tar.bz2
android_packages_apps_Snap-302dfef488297152978788c2341cd3460727b251.zip
snap: UI checkpoint #2
* Fix bugs from previous commit * Factor out recording controls * Clean up layouts * Asynchronous control for video module * Performance improvements Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625
Diffstat (limited to 'res/layout/video_module.xml')
-rw-r--r--res/layout/video_module.xml65
1 files changed, 27 insertions, 38 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index f12f06ce7..a6024d5d5 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -15,6 +15,7 @@
-->
<!-- This layout is shared by phone and tablet in landscape orientation. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="@android:color/black"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" >
@@ -23,11 +24,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|center_horizontal" >
- <SurfaceView
+ <com.android.camera.ui.AutoFitSurfaceView
android:id="@+id/mdp_preview_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
+
+ <View
+ android:id="@+id/preview_cover"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/black" />
+
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -37,53 +45,32 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
+ <com.android.camera.ui.focus.FocusRingView
+ android:id="@+id/focus_ring"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <com.android.camera.ui.CaptureAnimationOverlay
+ android:id="@+id/capture_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone" />
</FrameLayout>
- <View
- android:id="@+id/preview_cover"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@android:color/black" />
- <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"
- android:layout_height="match_parent"
- android:layout_width="match_parent">
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_height="match_parent"
- android:layout_width="match_parent">
- <com.android.camera.PauseButton android:id="@+id/video_pause"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginLeft="50dp"
- android:padding="38dp"
- android:src="@drawable/btn_pause_recording"/>
- <include layout="@layout/viewfinder_labels_video"
- android:id="@+id/labels" />
- </LinearLayout>
- </com.android.camera.ui.RotateLayout>
- <com.android.camera.ui.focus.FocusRingView
- android:id="@+id/focus_ring"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
- <com.android.camera.ui.CaptureAnimationOverlay
- android:id="@+id/capture_overlay"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone" />
+
+
+ <include layout="@layout/recording_time"
+ android:id="@+id/recording_time" />
+
<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"
@@ -92,7 +79,9 @@
android:scaleType="center"
android:visibility="gone"
android:onClick="onReviewPlayClicked"/>
+
<include layout="@layout/camera_controls"
android:layout_gravity="center"
style="@style/CameraControls"/>
+
</merge>