From 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Fri, 26 Dec 2014 18:10:22 -0800
Subject: SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot

Changed the Panoramic preview to full screen
Resized the warped preview image to smaller Size
and render on top of the full screen preview image

Change-Id: I98735dbed2ff4dada8708bf5a4a0f9da6ba030c7

Conflicts:
	res/layout-land/pano_preview_progress.xml
	res/layout-port/pano_preview_progress.xml
---
 res/layout/pano_module_capture.xml | 104 ++++++++-----------------------------
 1 file changed, 23 insertions(+), 81 deletions(-)

(limited to 'res/layout/pano_module_capture.xml')

diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
index c6c131741..d842ea12c 100644
--- a/res/layout/pano_module_capture.xml
+++ b/res/layout/pano_module_capture.xml
@@ -19,94 +19,36 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <LinearLayout
+    <FrameLayout
+        android:layout_gravity="center"
+        android:id="@+id/pano_preview_layout"
+        android:layout_weight="@integer/SRI_pano_layout_weight"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <!-- The top bar with capture indication -->
-        <FrameLayout
-            style="@style/PanoViewHorizontalBar"
+        <TextureView
+            android:id="@+id/pano_preview_textureview"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <TextView
-                android:id="@+id/pano_capture_indicator"
-                android:text="@string/pano_capture_indication"
-                android:textAppearance="?android:textAppearanceMedium"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </FrameLayout>
+            android:layout_height="match_parent" />
 
-        <FrameLayout
-            android:layout_gravity="center"
-            android:id="@+id/pano_preview_layout"
-            android:layout_weight="@integer/SRI_pano_layout_weight"
+        <View
+            android:id="@+id/pano_preview_area_border"
+            android:visibility="gone"
+            android:background="@drawable/ic_pan_border_fast"
             android:layout_width="match_parent"
-            android:layout_height="0dp">
-
-            <TextureView
-                android:id="@+id/pano_preview_textureview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/pano_preview_area_border"
-                android:visibility="gone"
-                android:background="@drawable/ic_pan_border_fast"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </FrameLayout>
-
-        <!-- The bottom bar with progress bar and direction indicators -->
-        <FrameLayout
-            style="@style/PanoViewHorizontalBar"
-            android:paddingTop="20dp"
-            android:gravity="top"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:layout_height="match_parent" />
+    </FrameLayout>
 
-                <com.android.camera.PanoProgressBar
-                    android:id="@+id/pano_pan_progress_bar"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_pan_progression"
-                    android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/pano_pan_left_indicator"
-                    android:src="@drawable/pano_direction_left_indicator"
-                    android:visibility="gone"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/pano_pan_right_indicator"
-                    android:src="@drawable/pano_direction_right_indicator"
-                    android:visibility="gone"
-                    android:layout_marginLeft="5dp"
-                    android:layout_toRightOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </RelativeLayout>
-        </FrameLayout>
-
-
-    </LinearLayout>
+    <include layout="@layout/pano_preview_progress" />
 
+    <TextView
+        android:id="@+id/pano_capture_indicator"
+        android:text="@string/pano_capture_indication"
+        android:textAppearance="?android:textAppearanceMedium"
+        android:layout_gravity="top|center_horizontal"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
     <!-- The hint for "Too fast" text view -->
     <TextView
         android:id="@+id/pano_capture_too_fast_textview"
-- 
cgit v1.2.3