diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-30 18:33:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 18:33:31 -0700 |
| commit | cb46d560990d7b39d0d341a89028a1b886acfb4c (patch) | |
| tree | 0c71140c7ec906e177f265900318b489794102c5 | |
| parent | 14f85082d9aba3819fd8f0f64bf5aaf28a2fbe9b (diff) | |
| parent | 1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a (diff) | |
| download | android_packages_apps_Snap-cb46d560990d7b39d0d341a89028a1b886acfb4c.tar.gz android_packages_apps_Snap-cb46d560990d7b39d0d341a89028a1b886acfb4c.tar.bz2 android_packages_apps_Snap-cb46d560990d7b39d0d341a89028a1b886acfb4c.zip | |
am 1d9a8d7a: Rename renering message from panorama to photo sphere.
* commit '1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a':
Rename renering message from panorama to photo sphere.
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 4 insertions, 5 deletions
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> |