summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-08-06 02:00:24 -0600
committerLinux Build Service Account <lnxbuild@localhost>2015-08-06 02:00:24 -0600
commit9c0c7189806ca0a83948af110b6efc00d08b1ea2 (patch)
treef47f2e62df3297fd9e71f5ac1bb1a4439aa91f47 /res/layout
parent35994d2a709ffd84c9a3b6e015c4a7628e8c5924 (diff)
parentfa458f0a64a6b4412912c9177ec0fbeed084a28f (diff)
downloadandroid_packages_apps_Snap-9c0c7189806ca0a83948af110b6efc00d08b1ea2.tar.gz
android_packages_apps_Snap-9c0c7189806ca0a83948af110b6efc00d08b1ea2.tar.bz2
android_packages_apps_Snap-9c0c7189806ca0a83948af110b6efc00d08b1ea2.zip
Merge fa458f0a64a6b4412912c9177ec0fbeed084a28f on remote branch
Change-Id: Ib0ecc314a7bd0b76c8e955402d9adfe0a4989223
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/photo_module.xml1
-rw-r--r--res/layout/video_module.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index a8ea2a169..afc637773 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -26,6 +26,7 @@
android:layout_gravity="center" >
<include layout="@layout/count_down_to_capture" />
<FrameLayout
+ android:id="@+id/preview_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|center_horizontal" >
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 6f36081e2..8fe42e178 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -19,6 +19,7 @@
android:layout_height="match_parent"
android:layout_gravity="center" >
<FrameLayout
+ android:id="@+id/preview_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|center_horizontal" >