commit c2cabbe9769f7b247ad66797f1dfbb493a9b3f12
author Romain Guy <romainguy@android.com> Thu Jun 11 11:42:01 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Jun 11 11:42:01 2009 -0700
tree 4299f6c97d54847d8d4024f5d38f2e8e6361f220
parent 051548ce42a0c72f32055b70c27cceedab4b8e93
parent ae4f575911d0c17de8d687a8fa092b0aa8360243

am ae4f5759: Improve the threading model in the gestures settings activity.

Merge commit 'ae4f575911d0c17de8d687a8fa092b0aa8360243'

* commit 'ae4f575911d0c17de8d687a8fa092b0aa8360243':
  Improve the threading model in the gestures settings activity.

src/com/android/launcher/GesturesActivity.java

diff --git a/src/com/android/launcher/GesturesActivity.java b/src/com/android/launcher/GesturesActivity.java
index a112e1b..c936576 100644
--- a/src/com/android/launcher/GesturesActivity.java
+++ b/src/com/android/launcher/GesturesActivity.java
@@ -209,7 +209,7 @@
         adapter.sort(mSorter);
         checkForEmpty();
         adapter.notifyDataSetChanged();
-        
+
         LauncherModel.deleteGestureFromDatabase(this, info);
 
         Toast.makeText(this, R.string.gestures_delete_success, Toast.LENGTH_SHORT).show();
@@ -239,6 +239,8 @@
                 final LauncherModel model = Launcher.getModel();
 
                 for (String name : store.getGestureEntries()) {
+                    if (isCancelled()) break;
+
                     final Gesture gesture = store.getGestures(name).get(0);
                     final Bitmap bitmap = gesture.toBitmap(mThumbnailSize, mThumbnailSize,
                             mThumbnailInset, mPathColor);