diff options
| author | Owen Lin <owenlin@google.com> | 2012-09-13 15:38:57 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2012-09-13 15:38:57 +0800 |
| commit | 222c07220dbe5b1be959437eb315ae72a0c8aa50 (patch) | |
| tree | 013a34335e29a6c9edc264b24a95f9705a14c792 | |
| parent | b265ebb01cc046b74329eeb28dbecb24e0f953d2 (diff) | |
| download | android_packages_apps_Gallery2-222c07220dbe5b1be959437eb315ae72a0c8aa50.tar.gz android_packages_apps_Gallery2-222c07220dbe5b1be959437eb315ae72a0c8aa50.tar.bz2 android_packages_apps_Gallery2-222c07220dbe5b1be959437eb315ae72a0c8aa50.zip | |
Cancel the loading task when clicking on back in Cropping.
bug: 5636363
Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
| -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; |