diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-23 23:57:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-23 23:57:17 -0700 |
| commit | 1a6d80d8b9f8a1b9f59fe40e437c732cb9b3cd6c (patch) | |
| tree | 97a547ef09087846779fe16bd9b5883b3bc0f0bb /src | |
| parent | 65aa4964bd869d0aeb63f82e87ff2dab11755725 (diff) | |
| parent | 67d977098e01e0adf2b35835859430f8232c8720 (diff) | |
| download | android_packages_apps_Gallery2-1a6d80d8b9f8a1b9f59fe40e437c732cb9b3cd6c.tar.gz android_packages_apps_Gallery2-1a6d80d8b9f8a1b9f59fe40e437c732cb9b3cd6c.tar.bz2 android_packages_apps_Gallery2-1a6d80d8b9f8a1b9f59fe40e437c732cb9b3cd6c.zip | |
Merge "Gallery2: Remove wait when notify dirty"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoDataAdapter.java | 6 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/ui/PhotoView.java | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java index c7dd48b1e..1b6f3def3 100755 --- a/src/com/android/gallery3d/app/PhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java @@ -1208,12 +1208,6 @@ public class PhotoDataAdapter implements PhotoPage.Model { } public synchronized void notifyDirty() { - while (mDirty) { - try { - wait(NOTIFY_DIRTY_WAIT_TIME); - } catch (Exception ex) { - } - } mDirty = true; notifyAll(); } diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index 5647e36af..c55f84a21 100755 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -1133,6 +1133,7 @@ public class PhotoView extends GLView { } private void deleteAfterAnimation(int duration) { + if (mHandler.hasMessages(MSG_DELETE_ANIMATION_DONE)) return; MediaItem item = mModel.getMediaItem(mTouchBoxIndex); if (item == null) return; mListener.onCommitDeleteImage(); |