diff options
| author | George Mount <mount@google.com> | 2012-10-10 10:42:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 10:42:56 -0700 |
| commit | 1bc511b04e64bde7fd0ae87f737a3f70efb9443c (patch) | |
| tree | 1832bc3bc8a15117f23b7c5559beaec7e8dc3649 /res | |
| parent | a5d84ae0e6fa42460a9d3f66991c73fa1949dbaa (diff) | |
| parent | adb12c599fbe3e70834abcac08a2d8116c859b24 (diff) | |
| download | android_packages_apps_Snap-1bc511b04e64bde7fd0ae87f737a3f70efb9443c.tar.gz android_packages_apps_Snap-1bc511b04e64bde7fd0ae87f737a3f70efb9443c.tar.bz2 android_packages_apps_Snap-1bc511b04e64bde7fd0ae87f737a3f70efb9443c.zip | |
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* commit '21832eb7fba76cd101ad5ef7b131292aa24f3864':
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/photopage_progress_bar.xml | 40 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 44 insertions, 0 deletions
diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml new file mode 100644 index 000000000..778feb365 --- /dev/null +++ b/res/layout/photopage_progress_bar.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/photopage_progress_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:padding="25dp" + android:visibility="invisible"> + <View + android:id="@+id/photopage_progress_background" + android:background="#ff000000" + android:layout_width="match_parent" + android:layout_height="8dp" + android:layout_alignParentBottom="true" + android:visibility="visible"/> + <View + android:id="@+id/photopage_progress_foreground" + android:background="#ff33b5e5" + android:layout_width="10dp" + android:layout_height="8dp" + android:layout_alignParentLeft="true" + android:layout_alignParentBottom="true" + android:visibility="visible"/> + <TextView + android:id="@+id/photopage_progress_bar_text" + android:text="@string/pano_progress_text" + android:textColor="#ffffffff" + android:textSize="14dp" + 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:layout_above="@id/photopage_progress_background" + android:paddingBottom="8dp" + android:visibility="visible"/> +</RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index c6ef704d7..92d4308d1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -496,4 +496,8 @@ <!-- Toast if the trimmed video is the same as the original one. [CHAR LIMIT=80] --> <string name="trim_too_long">Did not trim : the same length as origin</string> + + <!-- Text to show with progress bar while stitching in Gallery --> + <string name="pano_progress_text">Rendering panorama</string> + </resources> |