diff options
author | Michael Jurka <mikejurka@google.com> | 2013-10-29 15:50:06 +0100 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-10-29 22:50:30 +0100 |
commit | 619a180be5a67f5bcd7021d300bd35e8b5296e7f (patch) | |
tree | 950085d27748775b4295d4a1498cbd66d93af3ff /res/values | |
parent | 88400d521e9c46382d835f42c1d50235cf99b2eb (diff) | |
download | android_packages_apps_Trebuchet-619a180be5a67f5bcd7021d300bd35e8b5296e7f.tar.gz android_packages_apps_Trebuchet-619a180be5a67f5bcd7021d300bd35e8b5296e7f.tar.bz2 android_packages_apps_Trebuchet-619a180be5a67f5bcd7021d300bd35e8b5296e7f.zip |
Make wallpaper picker/cropper more robust
- don't crash if image passed to wallpaper picker
is invalid
- close input streams correctly
Bug: 11413915
Bug: 11380658
Bug: 11362731
Change-Id: I973e6bdc532d24a64efd6d174e89fdac626d7ee3
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/strings.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index cafa42442..1997c8b9a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -30,6 +30,14 @@ <string name="folder_name"></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 picker cannot load it --> + <string name="image_load_fail">Coudn\'t load image</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> <!-- Shown when wallpapers are selected in Wallpaper picker --> <!-- String indicating how many media item(s) is(are) selected eg. 1 selected [CHAR LIMIT=30] --> |