diff options
| -rwxr-xr-x | Android.mk | 1 | ||||
| -rw-r--r-- | res/menu/albumset.xml | 1 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoDataAdapter.java | 6 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/ui/PhotoView.java | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index f515ac03f..0b471b641 100755 --- a/Android.mk +++ b/Android.mk @@ -40,7 +40,6 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream ifeq ($(TARGET_TS_MAKEUP), true) - LOCAL_JNI_SHARED_LIBRARIES := libts_detected_face_jni libts_face_beautify_jni LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni endif diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml index 7d2f67624..182e83cd4 100644 --- a/res/menu/albumset.xml +++ b/res/menu/albumset.xml @@ -26,6 +26,7 @@ android:showAsAction="never" /> <item android:id="@+id/action_manage_offline" android:title="@string/make_available_offline" + android:visible="false" android:showAsAction="never" /> <item android:id="@+id/action_sync_picasa_albums" android:title="@string/sync_picasa_albums" 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(); |