Merge "Show capture indication for panorama."

8 files changed, 28 insertions, 5 deletions

diff --git a/res/drawable-hdpi/ic_pan_recording_indicator.png b/res/drawable-hdpi/ic_pan_recording_indicator.png
new file mode 100644
index 0000000..011d1e2
--- /dev/null
+++ b/res/drawable-hdpi/ic_pan_recording_indicator.png
diff --git a/res/drawable-mdpi/ic_pan_recording_indicator.png b/res/drawable-mdpi/ic_pan_recording_indicator.png
new file mode 100644
index 0000000..1fc9578
--- /dev/null
+++ b/res/drawable-mdpi/ic_pan_recording_indicator.png
diff --git a/res/drawable-xhdpi/ic_pan_recording_indicator.png b/res/drawable-xhdpi/ic_pan_recording_indicator.png
new file mode 100644
index 0000000..17fc574
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pan_recording_indicator.png
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 00af551..5988196 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -30,7 +30,22 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-            <ImageView style="@style/PanoViewHorizontalGrayBar"/>
+            <FrameLayout android:id="@+id/pano_capture_indicator_layout"
+                    style="@style/PanoViewHorizontalBar">
+
+                <TextView
+                        android:id="@+id/pano_capture_indicator"
+                        android:text="@string/pano_capture_indication"
+                        android:paddingTop="0dp"
+                        android:drawablePadding="5sp"
+                        android:drawableLeft="@drawable/ic_pan_recording_indicator"
+                        android:visibility="gone"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginTop="16dp"
+                        android:layout_gravity="top|left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+            </FrameLayout>
 
             <com.android.camera.panorama.MosaicRendererSurfaceView
                     android:id="@+id/pano_renderer"
@@ -39,7 +54,7 @@
                     android:layout_height="@dimen/pano_mosaic_surface_height" />
 
             <FrameLayout
-                style="@style/PanoViewHorizontalGrayBar">
+                style="@style/PanoViewHorizontalBar">
                 <com.android.camera.panorama.PanoProgressBar
                         android:id="@+id/pano_pan_progress_bar"
                         android:visibility="gone"
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 51ae880..9e0b750 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -22,7 +22,7 @@
         android:layout_height="match_parent">
 
     <LinearLayout android:id="@+id/pano_review_control"
-            style="@style/PanoViewHorizontalGrayBar"
+            style="@style/PanoViewHorizontalBar"
             android:gravity="right"
             android:orientation="horizontal"
             android:layout_alignParentBottom="true"
@@ -42,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/pano_mosaic_surface_height" />
 
-    <RelativeLayout style="@style/PanoViewHorizontalGrayBar">
+    <RelativeLayout style="@style/PanoViewHorizontalBar">
         <com.android.camera.panorama.PanoProgressBar
                 android:id="@+id/pano_saving_progress_bar"
                 android:src="@drawable/ic_pan_progression"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90e87c1..c679013 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -277,6 +277,9 @@
     <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
     <string name="pano_dialog_title">Panorama</string>
 
+    <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+    <string name="pano_capture_indication">Capturing Panorama</string>
+
     <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
     <string name="tap_to_focus">Tap to focus</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 78e7ba6..bd46fc3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -148,7 +148,7 @@
         <item name="android:textSize">16dp</item>
         <item name="android:background">@drawable/bg_text_on_preview</item>
     </style>
-    <style name="PanoViewHorizontalGrayBar">
+    <style name="PanoViewHorizontalBar">
         <item name="android:background">#000000</item>
         <item name="android:alpha">1.0</item>
         <item name="android:layout_width">match_parent</item>
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 1b7186f..f6d58b2 100644
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -108,6 +108,7 @@ public class PanoramaActivity extends Activity implements
     private View mCaptureLayout;
     private View mReviewLayout;
     private ImageView mReview;
+    private TextView mCaptureIndicator;
     private PanoProgressBar mPanoProgressBar;
     private PanoProgressBar mSavingProgressBar;
     private MosaicRendererSurfaceView mMosaicView;
@@ -443,6 +444,7 @@ public class PanoramaActivity extends Activity implements
         mTimeTaken = System.currentTimeMillis();
         mCaptureState = CAPTURE_STATE_MOSAIC;
         mShutterButton.setBackgroundResource(R.drawable.btn_shutter_pan_recording);
+        mCaptureIndicator.setVisibility(View.VISIBLE);
 
         // XML-style animations can not be used here. The Y position has to be calculated runtime.
         float ystart = mThumbnailView.getY();
@@ -500,6 +502,7 @@ public class PanoramaActivity extends Activity implements
     private void stopCapture() {
         mCaptureState = CAPTURE_STATE_VIEWFINDER;
         mTooFastPrompt.setVisibility(View.GONE);
+        mCaptureIndicator.setVisibility(View.GONE);
 
         mMosaicFrameProcessor.setProgressListener(null);
         stopCameraPreview();
@@ -565,6 +568,8 @@ public class PanoramaActivity extends Activity implements
         mSavingProgressBar.setBackgroundColor(appRes.getColor(R.color.pano_progress_empty));
         mSavingProgressBar.setDoneColor(appRes.getColor(R.color.pano_progress_indication));
 
+        mCaptureIndicator = (TextView) findViewById(R.id.pano_capture_indicator);
+
         mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail);
 
         mReviewLayout = (View) findViewById(R.id.pano_review_layout);