diff options
| author | Doris Liu <tianliu@google.com> | 2013-02-26 10:54:25 -0800 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-03-04 10:09:40 -0800 |
| commit | 08a98b9946503e97549d70fd0228dea81175159e (patch) | |
| tree | a0bad6a49126227ecb0047564cd1fe5d2ccec54a /res/layout/photo_module.xml | |
| parent | ac4e910c72e99d3b11e50b0174c89113ca981b6b (diff) | |
| download | android_packages_apps_Snap-08a98b9946503e97549d70fd0228dea81175159e.tar.gz android_packages_apps_Snap-08a98b9946503e97549d70fd0228dea81175159e.tar.bz2 android_packages_apps_Snap-08a98b9946503e97549d70fd0228dea81175159e.zip | |
Flatten view hierarchy and rotate views
TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)
TODO: Need to cancel capture animation in onConfigurationChanged()
Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
Diffstat (limited to 'res/layout/photo_module.xml')
| -rw-r--r-- | res/layout/photo_module.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index b2ad7028f..abf094e27 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -20,10 +20,20 @@ need to be recreated in onConfigurationChanged from old photo_module to this layout. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" +<merge xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:layout_gravity="center"> <include layout="@layout/count_down_to_capture"/> - <include layout="@layout/photo_module_content"/> -</FrameLayout>
\ No newline at end of file + + <ViewStub android:id="@+id/face_view_stub" + android:inflatedId="@+id/face_view" + android:layout="@layout/face_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"/> + <com.android.camera.ui.RenderOverlay + android:id="@+id/render_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</merge>
\ No newline at end of file |