Merge "Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot""

3 files changed, 285 insertions, 90 deletions

diff --git a/res/layout-land/pano_preview_progress.xml b/res/layout-land/pano_preview_progress.xml
index 772b8529e..c6c131741 100644
--- a/res/layout-land/pano_preview_progress.xml
+++ b/res/layout-land/pano_preview_progress.xml
@@ -14,37 +14,106 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/panorama_preview_progress"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:layout_gravity="bottom|center_horizontal">
-
-    <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"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/panorama_capture_layout"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <!-- The top bar with capture indication -->
+        <FrameLayout
+            style="@style/PanoViewHorizontalBar"
+            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>
+
+        <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="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">
+
+                <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>
+
+    <!-- The hint for "Too fast" text view -->
+    <TextView
+        android:id="@+id/pano_capture_too_fast_textview"
+        android:text="@string/pano_too_fast_prompt"
+        android:textAppearance="?android:textAppearanceMedium"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</RelativeLayout>
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+</FrameLayout>
diff --git a/res/layout-port/pano_preview_progress.xml b/res/layout-port/pano_preview_progress.xml
index 426ef0ba7..c6c131741 100644
--- a/res/layout-port/pano_preview_progress.xml
+++ b/res/layout-port/pano_preview_progress.xml
@@ -14,38 +14,106 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/panorama_preview_progress"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:layout_gravity="bottom|center_horizontal"
-    android:layout_marginBottom="100dp">
-
-    <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"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/panorama_capture_layout"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <!-- The top bar with capture indication -->
+        <FrameLayout
+            style="@style/PanoViewHorizontalBar"
+            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>
+
+        <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="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">
+
+                <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>
+
+    <!-- The hint for "Too fast" text view -->
+    <TextView
+        android:id="@+id/pano_capture_too_fast_textview"
+        android:text="@string/pano_too_fast_prompt"
+        android:textAppearance="?android:textAppearanceMedium"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</RelativeLayout>
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+</FrameLayout>
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
index d842ea12c..c6c131741 100644
--- a/res/layout/pano_module_capture.xml
+++ b/res/layout/pano_module_capture.xml
@@ -19,36 +19,94 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <FrameLayout
-        android:layout_gravity="center"
-        android:id="@+id/pano_preview_layout"
-        android:layout_weight="@integer/SRI_pano_layout_weight"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <TextureView
-            android:id="@+id/pano_preview_textureview"
+        <!-- The top bar with capture indication -->
+        <FrameLayout
+            style="@style/PanoViewHorizontalBar"
             android:layout_width="match_parent"
-            android:layout_height="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>
 
-        <View
-            android:id="@+id/pano_preview_area_border"
-            android:visibility="gone"
-            android:background="@drawable/ic_pan_border_fast"
+        <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" />
-    </FrameLayout>
+            android:layout_height="0dp">
 
-    <include layout="@layout/pano_preview_progress" />
+            <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">
+
+                <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>
 
-    <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"