diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-11-17 14:20:30 -0800 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-03-30 15:54:11 -0700 |
commit | 3618eb79912c36216b197580e54e366ab19d2a61 (patch) | |
tree | d3157d73b7a15382a5562e25e6cb72f073228835 /res/layout/capture_module.xml | |
parent | bdabec40fc13076c07fba8bb5d04a104cab2ddce (diff) | |
download | android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.tar.gz android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.tar.bz2 android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.zip |
SnapdragonCamera: Add Camera2 mode
Use camera2 API to show preview and take snapshot
CRs-Fixed: 989750
Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
Diffstat (limited to 'res/layout/capture_module.xml')
-rw-r--r-- | res/layout/capture_module.xml | 89 |
1 files changed, 20 insertions, 69 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 10017192b..2715dcbe2 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + Not a Contribution. + + Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,89 +26,37 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" > - <include layout="@layout/count_down_to_capture" /> - <include layout="@layout/selfie_flash_view" /> + 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" > + android:layout_gravity="center_vertical|center_horizontal"> + <SurfaceView android:id="@+id/mdp_preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + + <SurfaceView + android:id="@+id/mdp_preview_content2" + android:layout_width="100dp" + android:layout_height="100dp" /> </FrameLayout> + <View android:id="@+id/preview_cover" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" /> - <RelativeLayout android:id="@+id/linear" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <ProgressBar - style="?android:attr/progressBarStyleHorizontal" - android:id="@+id/progress" - android:orientation="vertical" - android:layout_width="200dip" - android:layout_height="wrap_content" - android:layout_marginTop="14dip" - android:layout_marginBottom="14dip" - android:layout_marginLeft="30dip" - android:layout_marginRight="30dip" /> - <com.android.camera.GraphView - android:id="@+id/graph_view" - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_marginTop="60dip" - android:layout_marginLeft="90dip" /> - <com.android.camera.DrawAutoHDR - android:id="@+id/autohdr_view" - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_marginTop="15dip" - android:layout_marginLeft="15dip" /> - </RelativeLayout> - <ImageView - android:id="@+id/review_image" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - android:clickable="true" - android:background="@android:color/black" - android:scaleType="fitCenter"/> - <View - android:id="@+id/flash_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white" - android:visibility="gone" - android:alpha="0" /> - <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 + style="@style/CameraControls" + layout="@layout/camera_controls" + android:layout_gravity="center" /> </merge> |