SnapdragonCamera: Panorama Module

Introducing Panorama capture module for Camera2

Change-Id: I98306c6c88c34c58b99adf9d472418392015f6c5
CRs-Fixed: 1067848

8 files changed, 51 insertions, 0 deletions

diff --git a/res/drawable-hdpi/exit_panorama.png b/res/drawable-hdpi/exit_panorama.png
new file mode 100644
index 000000000..15161d503
--- /dev/null
+++ b/res/drawable-hdpi/exit_panorama.png
diff --git a/res/drawable-hdpi/scene_panorama.png b/res/drawable-hdpi/scene_panorama.png
new file mode 100644
index 000000000..405bc5d53
--- /dev/null
+++ b/res/drawable-hdpi/scene_panorama.png
diff --git a/res/drawable-xhdpi/scene_panorama.png b/res/drawable-xhdpi/scene_panorama.png
new file mode 100644
index 000000000..f5403b45f
--- /dev/null
+++ b/res/drawable-xhdpi/scene_panorama.png
diff --git a/res/drawable-xxhdpi/scene_panorama.png b/res/drawable-xxhdpi/scene_panorama.png
new file mode 100644
index 000000000..ece66e3da
--- /dev/null
+++ b/res/drawable-xxhdpi/scene_panorama.png
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 9d6ebf090..59f395b19 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -79,6 +79,11 @@
         android:src="@drawable/btn_new_shutter_video" />
 
     <com.android.camera.ui.RotateImageView
+        android:id="@+id/exit_panorama"
+        style="@style/MenuButton"
+        android:src="@drawable/exit_panorama" />
+
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/preview_thumb"
         android:layout_width="@dimen/capture_size"
         android:layout_height="@dimen/capture_size"
diff --git a/res/layout/pano_capture_module.xml b/res/layout/pano_capture_module.xml
new file mode 100644
index 000000000..e382570ef
--- /dev/null
+++ b/res/layout/pano_capture_module.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+     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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|center_horizontal">
+        <com.android.camera.ui.AutoFitSurfaceView
+            android:id="@+id/mdp_preview_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+    </FrameLayout>
+    <com.android.camera.ui.PanoCaptureProcessView
+        android:id="@+id/preview_process_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+    <include
+        style="@style/CameraControls"
+        layout="@layout/camera_controls"
+        android:layout_gravity="center" />
+</merge>
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index e5fcb7fdf..453627b2c 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -134,6 +134,7 @@
         <item>9</item>
         <item>-1</item>
         <item>103</item>
+        <item>104</item>
     </string-array>
 
     <!-- Camera Preferences Scene Mode dialog box entries -->
@@ -155,6 +156,7 @@
         <item>@string/pref_camera_scenemode_entry_snow</item>
         <item>@string/pref_camera_scenemode_entry_asd</item>
         <item>@string/pref_camera_scenemode_entry_bestpicture</item>
+        <item>@string/pref_camera_scenemode_entry_panorama</item>
     </string-array>
 
     <array name="pref_camera2_scenemode_thumbnails" translatable="false">
@@ -175,6 +177,7 @@
         <item>@drawable/snow</item>
         <item>@drawable/ic_scene_mode_smartauto</item>
         <item>@drawable/pick_the_best_photo</item>
+        <item>@drawable/scene_panorama</item>
     </array>
 
     <string-array name="pref_camera2_whitebalance_entryvalues" translatable="false">
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 9d87cb1ce..c27ec976a 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1024,6 +1024,7 @@
     <string name="pref_camera2_videosnap_entry_disable" translatable="true">Disable</string>
     <string name="pref_camera2_trackingfocus_title" translatable="true">Tracking Focus</string>
     <string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string>
+    <string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string>
     <string name="bestpicture_done" translatable="true">DONE</string>
     <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string>
 
@@ -1044,5 +1045,6 @@
     <string name="pref_camera2_timer_value_2sec" translatable="false">2</string>
     <string name="pref_camera2_timer_value_5sec" translatable="false">5</string>
     <string name="pref_camera2_timer_value_10sec" translatable="false">10</string>
+    <string name="panocapture_direction_is_not_determined" translatable="true">Direction is not detected.</string>
 </resources>