From: Sascha Haeberling <haeberling@google.com>
Date: Sat, 31 Aug 2013 01:11:20 +0000 (-0700)
Subject: Rename renering message from panorama to photo sphere.
X-Git-Tag: android-x86-6.0-r3~1684^2~224
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1d9a8d7a;p=android-x86%2Fpackages-apps-Camera2.git

Rename renering message from panorama to photo sphere.

  Bug: 7695145

Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315
---

diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 80e6c4b3a..89fd8ccbf 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -47,16 +47,15 @@
 
             <TextView
                 android:id="@+id/pano_stitching_progress_text"
-                android:text="@string/pano_progress_text"
+                android:text="@string/rendering_photo_sphere"
                 android:textColor="#ffffffff"
-                android:textSize="14dp"
+                android:textSize="14sp"
                 android:shadowColor="#ff000000"
                 android:shadowDx="0"
                 android:shadowDy="0"
                 android:shadowRadius="2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:paddingBottom="8dp"
                 android:visibility="visible"
                 android:layout_gravity="right"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 131560d79..0f0ebf561 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -519,8 +519,8 @@
     <!-- Toast if the trimmed video is too short to trim. [CHAR LIMIT=80] -->
     <string name="trim_too_short">Can not trim : target video is too short</string>
 
-    <!-- Text to show with progress bar while stitching in Gallery -->
-    <string name="pano_progress_text">Rendering panorama</string>
+    <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=28]-->
+    <string name="rendering_photo_sphere">Rendering photo sphere</string>
 
     <!-- The label on the button that will save an edited image -->
     <string name="save" msgid="8140440041190264400">Save</string>