SnapdragonCamera: Use MDP composition instead of GPU

Use MDP composition instead of GPU

Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04

2 files changed, 109 insertions, 110 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"
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index af839e774..6f36081e2 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -15,25 +15,26 @@
 -->
 <!-- This layout is shared by phone and tablet in landscape orientation. -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
-    <!-- Wrap a frame layout around texture view so that when scaled, texture
-         view will not draw outside its unscaled bounds -->
+    android:layout_gravity="center" >
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <TextureView
-            android:id="@+id/preview_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-        <View
-            android:id="@+id/preview_cover"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|center_horizontal" >
+        <SurfaceView
+            android:id="@+id/mdp_preview_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/black"
             android:visibility="gone" />
     </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" />
+    <View
         android:id="@+id/flash_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -41,47 +42,46 @@
         android:visibility="gone"
         android:alpha="0" />
     <FrameLayout android:id="@+id/preview_border"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            android:background="@drawable/ic_snapshot_border" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:background="@drawable/ic_snapshot_border" />
     <com.android.camera.ui.RenderOverlay
         android:id="@+id/render_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
     <com.android.camera.ui.RotateLayout
         android:id="@+id/recording_time_rect"
-         android:layout_height="match_parent"
-         android:layout_width="match_parent">
-            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:orientation="horizontal"
-                    android:layout_height="match_parent"
-                    android:layout_width="match_parent">
-                <com.android.camera.PauseButton android:id="@+id/video_pause"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:layout_marginLeft="50dp"
-                        android:padding="23dp"
-                        android:visibility="gone"
-                        android:src="@drawable/btn_pause_recording"/>
-                 <include layout="@layout/viewfinder_labels_video"
-                          android:id="@+id/labels" />
-            </LinearLayout>
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="horizontal"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent">
+            <com.android.camera.PauseButton android:id="@+id/video_pause"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:padding="23dp"
+                android:visibility="gone"
+                android:src="@drawable/btn_pause_recording"/>
+            <include layout="@layout/viewfinder_labels_video"
+                android:id="@+id/labels" />
+        </LinearLayout>
     </com.android.camera.ui.RotateLayout>
     <ImageView android:id="@+id/review_image"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:visibility="gone"
-            android:background="@android:color/black"/>
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:visibility="gone"
+        android:background="@android:color/black"/>
     <ImageView
-            android:id="@+id/btn_play"
-            style="@style/ReviewControlIcon"
-            android:layout_centerInParent="true"
-            android:src="@drawable/ic_gallery_play_big"
-            android:scaleType="center"
-            android:visibility="gone"
-            android:onClick="onReviewPlayClicked"/>
-
+        android:id="@+id/btn_play"
+        style="@style/ReviewControlIcon"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_gallery_play_big"
+        android:scaleType="center"
+        android:visibility="gone"
+        android:onClick="onReviewPlayClicked"/>
     <include layout="@layout/camera_controls"
         android:layout_gravity="center"
         style="@style/CameraControls"/>