Check in the Mosaic Stitching codes.

1. Camera setup moved to activity level.
2. Fixed releasing and acquiring camera process.
3. Unused .xml files removed.
4. Style issues fixed.

Bug: 5031489
Change-Id: Ifd271588ca2168398e17f204f065681ead2d8f2f

4 files changed, 100 insertions, 1 deletions

diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index a7dee7d..f2790fb 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -15,7 +15,6 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
         android:layout_height="match_parent"
         android:layout_width="76dp"
         android:paddingTop="13dp"
diff --git a/res/layout/pano_control.xml b/res/layout/pano_control.xml
new file mode 100644
index 0000000..530ffc6
--- /dev/null
+++ b/res/layout/pano_control.xml
@@ -0,0 +1,32 @@
+<?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:layout_height="match_parent"
+        android:layout_width="76dp"
+        android:paddingTop="13dp">
+
+    <include layout="@layout/review_thumbnail"/>
+
+    <com.android.camera.ShutterButton android:id="@+id/pano_shutter_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/btn_ic_camera_shutter"
+            android:background="@drawable/btn_shutter"/>
+</RelativeLayout>
diff --git a/res/layout/pano_views.xml b/res/layout/pano_views.xml
new file mode 100644
index 0000000..ef7738d
--- /dev/null
+++ b/res/layout/pano_views.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:id="@+id/pano_views_layout"
+        android:gravity="center"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:layout_weight="1"
+        android:layout_marginLeft="2dp">
+    <FrameLayout android:id="@+id/pano_preview_layout"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="720dp">
+        <com.android.camera.panorama.Preview
+                android:id="@+id/pano_preview"
+                android:layout_gravity="center"
+                android:layout_width="240dp"
+                android:layout_height="180dp"/>
+        <com.android.camera.panorama.CaptureView android:id="@+id/pano_capture_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+    </FrameLayout>
+    <ImageView android:id="@+id/pano_reviewarea"
+            android:scaleType="center"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+</FrameLayout>
+
diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml
new file mode 100644
index 0000000..b92d81d
--- /dev/null
+++ b/res/layout/panorama.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:id="@+id/panorama_root"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <include layout="@layout/pano_views"/>
+    <include layout="@layout/pano_control"/>
+</LinearLayout>