diff options
| author | Tony Wickham <twickham@google.com> | 2015-09-25 21:22:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-25 21:22:44 +0000 |
| commit | cb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38 (patch) | |
| tree | 17c5fd2d93117182ea28f9c0b5b48d80b7c70342 | |
| parent | d21301e674377ecd72bd14f32b52c68fabcfd3be (diff) | |
| parent | 14a43ce3e69730ee17486e140dc76142f6f05254 (diff) | |
| download | android_packages_apps_Trebuchet-cb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38.tar.gz android_packages_apps_Trebuchet-cb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38.tar.bz2 android_packages_apps_Trebuchet-cb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38.zip | |
Merge "Inform users when "Set wallpaper" fails." into ub-launcher3-burnaby-polish
| -rw-r--r-- | WallpaperPicker/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/WallpaperPicker/res/values/strings.xml b/WallpaperPicker/res/values/strings.xml index 72b1e15df..2bfd4767f 100644 --- a/WallpaperPicker/res/values/strings.xml +++ b/WallpaperPicker/res/values/strings.xml @@ -28,6 +28,9 @@ 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> + <!-- Error message when an image is selected as a wallpaper, + but something goes wrong when the user clicks "Set wallpaper" --> + <string name="wallpaper_set_fail">Couldn\'t set 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] --> diff --git a/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java b/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java index a79fb65c9..8b5144748 100644 --- a/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java +++ b/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java @@ -31,6 +31,9 @@ import android.graphics.RectF; import android.net.Uri; import android.os.AsyncTask; import android.util.Log; +import android.widget.Toast; + +import com.android.launcher3.R; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -395,9 +398,12 @@ public class BitmapCropTask extends AsyncTask<Void, Void, Boolean> { } @Override - protected void onPostExecute(Boolean result) { + protected void onPostExecute(Boolean cropSucceeded) { + if (!cropSucceeded) { + Toast.makeText(mContext, R.string.wallpaper_set_fail, Toast.LENGTH_SHORT).show(); + } if (mOnEndCropHandler != null) { - mOnEndCropHandler.run(result); + mOnEndCropHandler.run(cropSucceeded); } } }
\ No newline at end of file |