summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-05-10 16:59:33 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-25 21:55:20 -0700
commit9cd5721ea88d24549a2946e1aaaef04993bc94d6 (patch)
tree5cace1ebb46725b06e76340b2e902ffc682d8903 /res/layout
parent56881f01e46cd33506b7d8a9ee1a7e66165c4519 (diff)
downloadandroid_packages_apps_Snap-9cd5721ea88d24549a2946e1aaaef04993bc94d6.zip
android_packages_apps_Snap-9cd5721ea88d24549a2946e1aaaef04993bc94d6.tar.gz
android_packages_apps_Snap-9cd5721ea88d24549a2946e1aaaef04993bc94d6.tar.bz2
SnapdragonCamera: Add video to Camera2 module
Add video to Camera2 module and combine the UI Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera_controls.xml13
-rw-r--r--res/layout/capture_module.xml25
2 files changed, 38 insertions, 0 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 77ff076..6c40f1b 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -45,6 +45,19 @@
android:scaleType="fitCenter"
android:src="@drawable/btn_new_shutter" />
+ <ImageView
+ android:id="@+id/video_button"
+ android:visibility="invisible"
+ android:layout_width="@dimen/shutter_size"
+ android:layout_height="@dimen/shutter_size"
+ android:layout_gravity="bottom|center_horizontal"
+ android:layout_marginBottom="@dimen/shutter_offset"
+ android:clickable="true"
+ android:contentDescription="@string/accessibility_shutter_button"
+ android:focusable="true"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_new_shutter_video" />
+
<com.android.camera.ui.RotateImageView
android:id="@+id/preview_thumb"
android:layout_width="@dimen/capture_size"
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index d91b49a..3b4f025 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -56,6 +56,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/recording_time_rect"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
+ <com.android.camera.PauseButton
+ android:id="@+id/video_pause"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="70dp"
+ android:padding="23dp"
+ android:src="@drawable/btn_pause_recording"/>
+
+ <include
+ android:id="@+id/labels"
+ layout="@layout/viewfinder_labels_video"/>
+ </LinearLayout>
+ </com.android.camera.ui.RotateLayout>
+
<include
style="@style/CameraControls"
layout="@layout/camera_controls"