diff options
author | Owen Lin <owenlin@google.com> | 2012-09-14 00:04:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-14 00:04:37 -0700 |
commit | 07c3fac5195496cb18ec60c82ffc036fc567fd99 (patch) | |
tree | c372ec54a0a3e8015df0fb70d19342293d76fcc2 /src | |
parent | ee96fa8b2c67ab4ae2ac1cb3c0d9795af04cc9b7 (diff) | |
parent | bd12e52656278fd61635c7d54bfe493e80dc9817 (diff) | |
download | android_packages_apps_Snap-07c3fac5195496cb18ec60c82ffc036fc567fd99.tar.gz android_packages_apps_Snap-07c3fac5195496cb18ec60c82ffc036fc567fd99.tar.bz2 android_packages_apps_Snap-07c3fac5195496cb18ec60c82ffc036fc567fd99.zip |
Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/CropImage.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/CropImage.java b/src/com/android/gallery3d/app/CropImage.java index 90eb8e5bb..c77f57c05 100644 --- a/src/com/android/gallery3d/app/CropImage.java +++ b/src/com/android/gallery3d/app/CropImage.java @@ -101,6 +101,7 @@ public class CropImage extends AbstractGalleryActivity { private static final int MSG_BITMAP = 2; private static final int MSG_SAVE_COMPLETE = 3; private static final int MSG_SHOW_SAVE_ERROR = 4; + private static final int MSG_CANCEL_DIALOG = 5; private static final int MAX_BACKUP_IMAGE_SIZE = 320; private static final int DEFAULT_COMPRESS_QUALITY = 90; @@ -206,6 +207,11 @@ public class CropImage extends AbstractGalleryActivity { finish(); break; } + case MSG_CANCEL_DIALOG: { + setResult(RESULT_CANCELED); + finish(); + break; + } } } }; @@ -877,7 +883,9 @@ public class CropImage extends AbstractGalleryActivity { } mProgressDialog = ProgressDialog.show( - this, null, getString(R.string.loading_image), true, false); + this, null, getString(R.string.loading_image), true, true); + mProgressDialog.setCanceledOnTouchOutside(false); + mProgressDialog.setCancelMessage(mMainHandler.obtainMessage(MSG_CANCEL_DIALOG)); mMediaItem = getMediaItemFromIntentData(); if (mMediaItem == null) return; |