summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker/src
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-09-25 21:27:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-25 21:27:56 +0000
commit25beed886fe733465f666b8bad4fadb636ced4e3 (patch)
tree0da9485070af9149e2cde7d057613c30f90fcde2 /WallpaperPicker/src
parent1f604dfbc7a2ebe1bd04f9bce14a3b858f23a283 (diff)
parentcb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38 (diff)
downloadandroid_packages_apps_Trebuchet-25beed886fe733465f666b8bad4fadb636ced4e3.tar.gz
android_packages_apps_Trebuchet-25beed886fe733465f666b8bad4fadb636ced4e3.tar.bz2
android_packages_apps_Trebuchet-25beed886fe733465f666b8bad4fadb636ced4e3.zip
am cb20e0bc: Merge "Inform users when "Set wallpaper" fails." into ub-launcher3-burnaby-polish
* commit 'cb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38': Inform users when "Set wallpaper" fails.
Diffstat (limited to 'WallpaperPicker/src')
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java b/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java
index 47c40eb97..212fb84ea 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