summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorLi Sun <sunli@codeaurora.org>2013-08-07 14:08:06 +0800
committerLinux Build Service Account <lnxbuild@localhost>2014-11-04 08:23:17 -0700
commit90ade05b6276acb084d490003253d7e3d35e1c47 (patch)
tree9b76be6346da3ffc8681bcbf6d11f001320d8c0f /res/values
parent9043df532143a9eb751e2b095ae495ae8a5f054e (diff)
downloadandroid_packages_apps_Gallery2-90ade05b6276acb084d490003253d7e3d35e1c47.tar.gz
android_packages_apps_Gallery2-90ade05b6276acb084d490003253d7e3d35e1c47.tar.bz2
android_packages_apps_Gallery2-90ade05b6276acb084d490003253d7e3d35e1c47.zip
Gallery2: avoid the crash of gallery during trimming videostaging/cm-12.0-caf
- Google only provides the lib of mp4 parser to support the video-trim feature. But some files would fail to trim and cause the gallery crash - catch the IllegalStateException to avoid the crash of gallery Change-Id: Iadda7a42d4d694c102d50d2c52a93979ba2907a7 CRs-Fixed: 523986
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13027efd7..e19f95082 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1118,4 +1118,7 @@ CHAR LIMIT = NONE] -->
<item quantity="one">%1$d photo</item>
<item quantity="other">%1$d photos</item>
</plurals>
+
+ <!-- The tips of trimming video -->
+ <string name="fail_trim">Sorry, this video file can not be trimmed</string>
</resources>