diff options
| author | Doris Liu <tianliu@google.com> | 2013-06-13 17:20:31 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-06-18 10:16:55 -0700 |
| commit | 9194ad576d53852039f7de823ce3e54232e680d6 (patch) | |
| tree | 2e5a6ea71d7b64ed5c9a0d01d658fcbf65055760 /res/layout/photo_module.xml | |
| parent | cf55a94b8bba764df380e4e49fe7baaa03d72575 (diff) | |
| download | android_packages_apps_Snap-9194ad576d53852039f7de823ce3e54232e680d6.tar.gz android_packages_apps_Snap-9194ad576d53852039f7de823ce3e54232e680d6.tar.bz2 android_packages_apps_Snap-9194ad576d53852039f7de823ce3e54232e680d6.zip | |
Switch over to use new camera activity
Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
Diffstat (limited to 'res/layout/photo_module.xml')
| -rw-r--r-- | res/layout/photo_module.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index abf094e27..70a7579b7 100644 --- 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 |