From 41a2e9735136f372de95652d0828600282c8e967 Mon Sep 17 00:00:00 2001
From: mbansal <mayank.bansal@sri.com>
Date: Mon, 8 Aug 2011 20:23:02 -0400
Subject: Updates to allow using SurfaceTexture for reading the preview frames
 directly from GPU memory.

1) SurfaceTexture is now used to obtain the data processed by the mosaicing library.
2) SurfaceTexture in GPU memory is directly rendered using the transformation from the mosaicing library to generate the preview mosaic.
3) GPU is also used to generate the Low-Res frames from the High-res frames (was being done in CPU before).
4) SurfaceTexture is also used to render the viewfinder as soon as the mosaicing application starts (eliminating the need for a separate SurfaceHolder to render the camera).
5) Modified the XML layout during the preview state to be the same size as during the capture stage to accommodate the SurfaceTexture based viewfinder [this needs to be reviewed and adjusted].
6) Fixed the viewfinder and back button issues identified by Wei-Ta.
7) Round-1 of removing trailing spaces and tabs.
8) Added documentation to new Java side interfaces and cleaned up code in general.
9) Cleaned up redundant and commented out code from the native side.
10) Merged with latest updates from the main trunk.
11) Fixed issues identified in code review and also cleaned up and refactored some code.
12) Added layout-w1024dp/pano_capture.xml for tablet layout.

Change-Id: If8fb0116de6c7fc6652cc67ac453553726961c32
---
 res/layout-w1024dp/pano_capture.xml | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 res/layout-w1024dp/pano_capture.xml

(limited to 'res/layout-w1024dp')

diff --git a/res/layout-w1024dp/pano_capture.xml b/res/layout-w1024dp/pano_capture.xml
new file mode 100644
index 0000000..0ce34b9
--- /dev/null
+++ b/res/layout-w1024dp/pano_capture.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pano_capture_layout" android:visibility="invisible"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout android:layout_weight="1" android:gravity="center"
+        android:layout_width="match_parent" android:layout_height="match_parent">
+        <com.android.camera.panorama.CaptureView
+            android:id="@+id/pano_capture_view" android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+        <com.android.camera.panorama.MosaicRendererSurfaceView
+            android:id="@+id/pano_renderer" android:layout_gravity="center"
+            android:layout_width="960dp" android:layout_height="360dp" />
+    </FrameLayout>
+
+    <ImageView style="@style/PanoViewHorizontalGrayBar"
+        android:layout_alignParentTop="true" android:layout_width="match_parent" />
+
+    <LinearLayout android:id="@+id/pano_capture_control"
+            style="@style/PanoViewHorizontalGrayBar"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:layout_alignParentBottom="true"
+            android:layout_width="match_parent">
+
+        <Button android:id="@+id/pano_capture_stop_button"
+                android:text="@string/pano_capture_stop"
+                android:onClick="onStopButtonClicked"
+                android:textSize="24dp"
+                android:layout_width="180dp"
+                android:layout_height="180dp" />
+    </LinearLayout>
+</RelativeLayout>
-- 
cgit v1.1