summaryrefslogtreecommitdiffstats
path: root/packages/WallpaperCropper/res
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-10-30 14:40:39 +0100
committerMichael Jurka <mikejurka@google.com>2013-10-30 14:54:21 +0100
commit7b215cb92288aa0a21bc773511ddd537b8fbb459 (patch)
tree782eaddd66fc3c1b685630054126b1653833d9d3 /packages/WallpaperCropper/res
parent0e29faacecdb728e2878c799da8532e33539f046 (diff)
downloadframeworks_base-7b215cb92288aa0a21bc773511ddd537b8fbb459.zip
frameworks_base-7b215cb92288aa0a21bc773511ddd537b8fbb459.tar.gz
frameworks_base-7b215cb92288aa0a21bc773511ddd537b8fbb459.tar.bz2
Make wallpaper cropper more robust
- don't crash if image passed to wallpaper picker is invalid - close input streams correctly Bug: 11413915 Bug: 11380658 Bug: 11362731
Diffstat (limited to 'packages/WallpaperCropper/res')
-rw-r--r--packages/WallpaperCropper/res/values/strings.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/WallpaperCropper/res/values/strings.xml b/packages/WallpaperCropper/res/values/strings.xml
index 2b8111d..091869a 100644
--- a/packages/WallpaperCropper/res/values/strings.xml
+++ b/packages/WallpaperCropper/res/values/strings.xml
@@ -17,4 +17,9 @@
<string name="crop_wallpaper">Crop wallpaper</string>
<!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
<string name="wallpaper_instructions">Set wallpaper</string>
+ <!-- Error message when an image is selected as a wallpaper,
+ but the wallpaper cropper cannot load it. The user will
+ usually see this when using another app and trying to set
+ an image as the wallpaper -->
+ <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
</resources>