diff options
author | John Reck <jreck@google.com> | 2013-01-16 22:09:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-16 22:09:46 +0000 |
commit | 9003bd581c00a31db4c8291c99a30d5e74fe2dde (patch) | |
tree | a715bf0da422f79159d7b3ddd046a3218d33f67d | |
parent | 2c0396a28ebf8cad71d234a82add2afb763a68f4 (diff) | |
parent | 8af0426fff43fee962d3c23b8885d453ad6c2f3c (diff) | |
download | android_packages_apps_Snap-9003bd581c00a31db4c8291c99a30d5e74fe2dde.tar.gz android_packages_apps_Snap-9003bd581c00a31db4c8291c99a30d5e74fe2dde.tar.bz2 android_packages_apps_Snap-9003bd581c00a31db4c8291c99a30d5e74fe2dde.zip |
Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
-rw-r--r-- | src/com/android/gallery3d/data/ComboAlbumSet.java | 9 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/MediaSet.java | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/ComboAlbumSet.java b/src/com/android/gallery3d/data/ComboAlbumSet.java index 3f3674500..a2a041279 100644 --- a/src/com/android/gallery3d/data/ComboAlbumSet.java +++ b/src/com/android/gallery3d/data/ComboAlbumSet.java @@ -85,6 +85,15 @@ public class ComboAlbumSet extends MediaSet implements ContentListener { } @Override + public boolean loadIfDirty() { + boolean changed = false; + for (int i = 0; i < mSets.length; i++) { + changed |= mSets[i].loadIfDirty(); + } + return changed; + } + + @Override public void onContentDirty() { notifyContentChanged(); } diff --git a/src/com/android/gallery3d/data/MediaSet.java b/src/com/android/gallery3d/data/MediaSet.java index 87b5f56ef..9bc148f89 100644 --- a/src/com/android/gallery3d/data/MediaSet.java +++ b/src/com/android/gallery3d/data/MediaSet.java @@ -180,6 +180,12 @@ public abstract class MediaSet extends MediaObject { // in the same thread as getMediaItem(int, int) and getSubMediaSet(int). public abstract long reload(); + /** + * Synchronously load if the MediaSet is dirty + * @return True if new data was loaded, false otherwise + */ + public boolean loadIfDirty() { throw new IllegalStateException("not implemented"); } + @Override public MediaDetails getDetails() { MediaDetails details = super.getDetails(); |