diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2014-08-29 17:56:11 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-17 17:55:49 -0800 |
commit | ff68f85c5e55d28d329af073f51dea48c37a9df3 (patch) | |
tree | 0348209524a34fefdef251cb59d8f8db53a7fd4b /res/layout/photo_module.xml | |
parent | 74dbd7a70f07f6c3e0e1e3f9a83d7102c681d076 (diff) | |
download | android_packages_apps_Snap-ff68f85c5e55d28d329af073f51dea48c37a9df3.tar.gz android_packages_apps_Snap-ff68f85c5e55d28d329af073f51dea48c37a9df3.tar.bz2 android_packages_apps_Snap-ff68f85c5e55d28d329af073f51dea48c37a9df3.zip |
SnapdragonCamera: Use MDP composition instead of GPU
Use MDP composition instead of GPU
Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
Diffstat (limited to 'res/layout/photo_module.xml')
-rw-r--r-- | res/layout/photo_module.xml | 133 |
1 files changed, 66 insertions, 67 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 5f6bcb0d5..5047112a0 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -23,63 +23,68 @@ <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"/> - <!-- Wrap a frame layout around texture view so that when scaled, texture - view will not draw outside its unscaled bounds --> + android:layout_gravity="center" > + <include layout="@layout/count_down_to_capture" /> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center_vertical|center_horizontal"> - <TextureView - android:id="@+id/preview_content" + android:layout_gravity="center_vertical|center_horizontal" > + <SurfaceView + android:id="@+id/mdp_preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> - </FrameLayout> - <RelativeLayout android:id="@+id/linear" + </FrameLayout> + <View + android:id="@+id/preview_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" + android:visibility="gone" /> + <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" /> + <TableLayout + android:id="@+id/relative_seek" android:layout_width="match_parent" - android:layout_height="match_parent"> - <ProgressBar - style="?android:attr/progressBarStyleHorizontal" - android:id="@+id/progress" - android:visibility="gone" - 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" /> - <TableLayout - android:id="@+id/relative_seek" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="20px" - android:layout_marginRight="20px" - android:layout_marginLeft="20px" - android:stretchColumns="1"> - <TableRow> <TextView + android:layout_height="match_parent" + android:layout_marginTop="20px" + android:layout_marginRight="20px" + android:layout_marginLeft="20px" + android:stretchColumns="1"> + <TableRow> + <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/skintonetitle" android:layout_gravity="center" android:textSize="22.0sp" android:textStyle="bold" /> - </TableRow> - <TableRow> <SeekBar + </TableRow> + <TableRow> + <SeekBar android:id="@+id/skintoneseek" android:layout_below="@+id/skintonetitle" android:layout_width="match_parent" @@ -87,29 +92,23 @@ android:layout_height="33dip" android:layout_marginLeft="25px" android:layout_marginTop="2dip"/> - </TableRow> - <TableRow> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/skintoneleft" - android:textSize="22.0sp" - android:textStyle="bold" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/skintoneright" - android:textSize="22.0sp" - android:textStyle="bold"/> - </TableRow> - </TableLayout> - </RelativeLayout> - <View - android:id="@+id/preview_cover" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/black" - android:visibility="gone" /> + </TableRow> + <TableRow> + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:id="@+id/skintoneleft" + android:textSize="22.0sp" + android:textStyle="bold" /> + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:id="@+id/skintoneright" + android:textSize="22.0sp" + android:textStyle="bold"/> + </TableRow> + </TableLayout> + </RelativeLayout> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" |