Direction indicator before panorama panning added.

bug:5141666
Change-Id: I2ede83f9a5d31544db6d8ea2a269f50da4a3bb7a

13 files changed, 24 insertions, 3 deletions

diff --git a/res/drawable-hdpi/ic_pan_left_indicator.png b/res/drawable-hdpi/ic_pan_left_indicator.png
new file mode 100644
index 0000000..c9a6907
--- /dev/null
+++ b/res/drawable-hdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-hdpi/ic_pan_right_indicator.png b/res/drawable-hdpi/ic_pan_right_indicator.png
new file mode 100644
index 0000000..2c4fe80
--- /dev/null
+++ b/res/drawable-hdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-mdpi/ic_pan_left_indicator.png b/res/drawable-mdpi/ic_pan_left_indicator.png
new file mode 100644
index 0000000..7b52deb
--- /dev/null
+++ b/res/drawable-mdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-mdpi/ic_pan_right_indicator.png b/res/drawable-mdpi/ic_pan_right_indicator.png
new file mode 100644
index 0000000..0e8059f
--- /dev/null
+++ b/res/drawable-mdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png b/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png
new file mode 100644
index 0000000..60d1f98
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png b/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png
new file mode 100644
index 0000000..f9b2ca2
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png b/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png
new file mode 100644
index 0000000..4579cf7
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png b/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png
new file mode 100644
index 0000000..de44206
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png b/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png
new file mode 100644
index 0000000..0bc4d06
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png b/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png
new file mode 100644
index 0000000..640e47d
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-xhdpi/ic_pan_left_indicator.png b/res/drawable-xhdpi/ic_pan_left_indicator.png
new file mode 100644
index 0000000..cab6c90
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-xhdpi/ic_pan_right_indicator.png b/res/drawable-xhdpi/ic_pan_right_indicator.png
new file mode 100644
index 0000000..7ffe6ac
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pan_right_indicator.png
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 5988196..fc949b7 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -30,6 +30,7 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
+            <!-- The top bar with capture indication -->
             <FrameLayout android:id="@+id/pano_capture_indicator_layout"
                     style="@style/PanoViewHorizontalBar">
 
@@ -53,16 +54,36 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/pano_mosaic_surface_height" />
 
-            <FrameLayout
+            <!-- The bottom bar with progress bar and direction indicators -->
+            <RelativeLayout
                 style="@style/PanoViewHorizontalBar">
                 <com.android.camera.panorama.PanoProgressBar
                         android:id="@+id/pano_pan_progress_bar"
                         android:visibility="gone"
                         android:src="@drawable/ic_pan_progression"
-                        android:layout_gravity="center"
+                        android:layout_centerInParent="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
-            </FrameLayout>
+                <ImageView
+                        android:id="@+id/pano_pan_left_indicator"
+                        android:src="@drawable/ic_pan_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/ic_pan_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>
 
         </LinearLayout>