diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-13 23:27:35 -0800 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:40 +0200 |
commit | 393a2d292a0b746c37ae9f131ffc9994affdaf74 (patch) | |
tree | f718e5145806b7b6d2488b9bf489d0853ebb8a8d /res/layout/photo_module.xml | |
parent | 586c4093fdcdb5459938e45b72becd242504c75b (diff) | |
download | android_packages_apps_Snap-393a2d292a0b746c37ae9f131ffc9994affdaf74.tar.gz android_packages_apps_Snap-393a2d292a0b746c37ae9f131ffc9994affdaf74.tar.bz2 android_packages_apps_Snap-393a2d292a0b746c37ae9f131ffc9994affdaf74.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/photo_module.xml')
-rw-r--r-- | res/layout/photo_module.xml | 59 |
1 files changed, 34 insertions, 25 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 794a968f4..d97298909 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -21,6 +21,7 @@ layout. --> <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" > @@ -31,25 +32,43 @@ 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" /> - <com.android.camera.ui.focus.FocusRingView - android:id="@+id/focus_ring" + + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" /> - <com.android.camera.ui.CaptureAnimationOverlay - android:id="@+id/capture_overlay" + android:layout_height="match_parent"> + <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.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> + + <com.android.camera.ui.RenderOverlay + android:id="@+id/render_overlay" android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> + android:layout_height="match_parent" /> + <com.android.camera.ui.RotateImageView android:id="@+id/review_image" android:layout_width="match_parent" @@ -58,29 +77,19 @@ android:clickable="true" android:background="@android:color/black" android:scaleType="fitCenter"/> - <FrameLayout - 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" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone"/> - </FrameLayout> - <com.android.camera.ui.RenderOverlay - 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"/> + <include layout="@layout/menu_help" android:layout_gravity="center" style="@style/CameraControls"/> + <RelativeLayout android:id="@+id/id_tsmakeup_level_layout_root" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> + + <include layout="@layout/camera_controls" + android:layout_gravity="center" + style="@style/CameraControls"/> + </merge> |