New progression bar used by saving and panning.

bug:5286267
Change-Id: I06f4cf147cdc5e68dc6cd7f5689ceb671a0fc43f

8 files changed, 13 insertions, 10 deletions

diff --git a/res/drawable-hdpi/ic_pan_progression.png b/res/drawable-hdpi/ic_pan_progression.png
new file mode 100644
index 0000000..69650f0
--- /dev/null
+++ b/res/drawable-hdpi/ic_pan_progression.png
diff --git a/res/drawable-mdpi/ic_pan_progression.png b/res/drawable-mdpi/ic_pan_progression.png
new file mode 100644
index 0000000..9425f32
--- /dev/null
+++ b/res/drawable-mdpi/ic_pan_progression.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_progression.png b/res/drawable-w1024dp-hdpi/ic_pan_progression.png
new file mode 100644
index 0000000..afe9188
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_pan_progression.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_progression.png b/res/drawable-w1024dp-mdpi/ic_pan_progression.png
new file mode 100644
index 0000000..d75ec8b
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_pan_progression.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_progression.png b/res/drawable-w1024dp-xhdpi/ic_pan_progression.png
new file mode 100644
index 0000000..22d8a4e
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_pan_progression.png
diff --git a/res/drawable-xhdpi/ic_pan_progression.png b/res/drawable-xhdpi/ic_pan_progression.png
new file mode 100644
index 0000000..756edb7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pan_progression.png
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 16145fd..2246fdd 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -16,7 +16,6 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/pano_capture_layout"
-        android:visibility="visible"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -39,20 +38,21 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/pano_mosaic_surface_height" />
 
-            <ImageView style="@style/PanoViewHorizontalGrayBar"/>
+            <RelativeLayout style="@style/PanoViewHorizontalGrayBar">
+                <com.android.camera.panorama.PanoProgressBar
+                        android:id="@+id/pano_capture_view"
+                        android:visibility="gone"
+                        android:src="@drawable/ic_pan_progression"
+                        android:layout_centerInParent="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+            </RelativeLayout>
+
         </LinearLayout>
         <include layout="@layout/camera_control" />
 
     </LinearLayout>
 
-    <com.android.camera.panorama.IndicationView
-            android:id="@+id/pano_capture_view"
-            android:visibility="gone"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_width="@dimen/pano_indication_width"
-            android:layout_height="@dimen/pano_indication_height" />
-
     <TextView android:id="@+id/pano_capture_too_fast_textview"
         android:text="@string/pano_too_fast_prompt"
         android:textAppearance="?android:textAppearanceMedium"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7d5081f..75ff158 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,4 +29,7 @@
     <color name="share_icon_background">#40000000</color>
     <color name="indicator_background">#40000000</color>
     <color name="pano_custom_dialog_background">#FF666666</color>
+    <color name="pano_progress_empty">#FF2E2E2E</color>
+    <color name="pano_progress_done">#FF33525E</color>
+    <color name="pano_progress_indication">#FF0099CC</color>
 </resources>