diff options
author | Chih-Chung Chang <chihchung@google.com> | 2012-06-26 10:47:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-26 10:47:37 -0700 |
commit | d75226857721967fc59104404b32d9f28afaa26a (patch) | |
tree | d6f8004aca7e5b5edd6e1f85ba1bcf1cb501f9e8 | |
parent | 57e297d1c6927759a18e599114676150b6cb0f26 (diff) | |
parent | 6de536dbc81345e1a19355fb9f3ad0aa2ea2ab8a (diff) | |
download | android_packages_apps_Snap-d75226857721967fc59104404b32d9f28afaa26a.tar.gz android_packages_apps_Snap-d75226857721967fc59104404b32d9f28afaa26a.tar.bz2 android_packages_apps_Snap-d75226857721967fc59104404b32d9f28afaa26a.zip |
am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background.
* commit '27a768018b18f45b9dd912bafd09dea64460f852':
Update thumbnail if a picture is deleted in background.
-rw-r--r-- | src/com/android/gallery3d/data/DataManager.java | 14 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalAlbum.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalVideo.java | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java index 0eb6af55e..85513279c 100644 --- a/src/com/android/gallery3d/data/DataManager.java +++ b/src/com/android/gallery3d/data/DataManager.java @@ -16,9 +16,11 @@ package com.android.gallery3d.data; +import android.content.Intent; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import android.support.v4.content.LocalBroadcastManager; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.Utils; @@ -78,6 +80,9 @@ public class DataManager { private static final String TOP_LOCAL_VIDEO_SET_PATH = "/local/video"; + private static final String ACTION_DELETE_PICTURE = + "com.android.gallery3d.action.DELETE_PICTURE"; + public static final Comparator<MediaItem> sDateTakenComparator = new DateTakenComparator(); @@ -305,6 +310,15 @@ public class DataManager { } } + // Sends a local broadcast if a local image or video is deleted. This is + // used to update the thumbnail shown in the camera app. + public void broadcastLocalDeletion() { + LocalBroadcastManager manager = LocalBroadcastManager.getInstance( + mApplication.getAndroidContext()); + Intent intent = new Intent(ACTION_DELETE_PICTURE); + manager.sendBroadcast(intent); + } + private static class NotifyBroker extends ContentObserver { private WeakHashMap<ChangeNotifier, Object> mNotifiers = new WeakHashMap<ChangeNotifier, Object>(); diff --git a/src/com/android/gallery3d/data/LocalAlbum.java b/src/com/android/gallery3d/data/LocalAlbum.java index 117dbb6fa..f45eebfd8 100644 --- a/src/com/android/gallery3d/data/LocalAlbum.java +++ b/src/com/android/gallery3d/data/LocalAlbum.java @@ -260,6 +260,7 @@ public class LocalAlbum extends MediaSet { GalleryUtils.assertNotInRenderThread(); mResolver.delete(mBaseUri, mWhereClause, new String[]{String.valueOf(mBucketId)}); + mApplication.getDataManager().broadcastLocalDeletion(); } @Override diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index b64b2c3f0..c432ab44d 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -247,6 +247,7 @@ public class LocalImage extends LocalMediaItem { Uri baseUri = Images.Media.EXTERNAL_CONTENT_URI; mApplication.getContentResolver().delete(baseUri, "_id=?", new String[]{String.valueOf(id)}); + mApplication.getDataManager().broadcastLocalDeletion(); } private static String getExifOrientation(int orientation) { diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index 4e888a573..5ccc21b93 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.java @@ -187,6 +187,7 @@ public class LocalVideo extends LocalMediaItem { Uri baseUri = Video.Media.EXTERNAL_CONTENT_URI; mApplication.getContentResolver().delete(baseUri, "_id=?", new String[]{String.valueOf(id)}); + mApplication.getDataManager().broadcastLocalDeletion(); } @Override |