diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-10-29 15:50:06 +0100 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:28:32 -0700 |
| commit | 64774df4524d5b9e8b23356316bafe6e1fdd2f21 (patch) | |
| tree | 1a3b199c070c5abdb60eaddf442e45c3b1ca7543 /res | |
| parent | c46482fe2103a62e24b07d09975af346540079d8 (diff) | |
| download | android_packages_apps_Trebuchet-64774df4524d5b9e8b23356316bafe6e1fdd2f21.tar.gz android_packages_apps_Trebuchet-64774df4524d5b9e8b23356316bafe6e1fdd2f21.tar.bz2 android_packages_apps_Trebuchet-64774df4524d5b9e8b23356316bafe6e1fdd2f21.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')
| -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 f916ad8a5..30f4d8fd3 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] --> |