diff options
author | John Reck <jreck@google.com> | 2013-03-21 14:22:33 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2013-03-21 14:42:46 -0700 |
commit | 705dc819661cb8c8e839a04577b0641bd6caad53 (patch) | |
tree | ec8e22e2bdd4c654a09838d4a744348016064742 /src/com/android/gallery3d/data/ClusterAlbumSet.java | |
parent | d6db9403125261d46e410db60b8a25f1d9014d2b (diff) | |
download | android_packages_apps_Gallery2-705dc819661cb8c8e839a04577b0641bd6caad53.tar.gz android_packages_apps_Gallery2-705dc819661cb8c8e839a04577b0641bd6caad53.tar.bz2 android_packages_apps_Gallery2-705dc819661cb8c8e839a04577b0641bd6caad53.zip |
Revert "New loading model"
Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
Diffstat (limited to 'src/com/android/gallery3d/data/ClusterAlbumSet.java')
-rw-r--r-- | src/com/android/gallery3d/data/ClusterAlbumSet.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/com/android/gallery3d/data/ClusterAlbumSet.java b/src/com/android/gallery3d/data/ClusterAlbumSet.java index a551de2ab..cb212ba36 100644 --- a/src/com/android/gallery3d/data/ClusterAlbumSet.java +++ b/src/com/android/gallery3d/data/ClusterAlbumSet.java @@ -24,7 +24,7 @@ import com.android.gallery3d.app.GalleryApp; import java.util.ArrayList; import java.util.HashSet; -public class ClusterAlbumSet extends MediaSetWrapper implements ContentListener { +public class ClusterAlbumSet extends MediaSet implements ContentListener { @SuppressWarnings("unused") private static final String TAG = "ClusterAlbumSet"; private GalleryApp mApplication; @@ -35,7 +35,7 @@ public class ClusterAlbumSet extends MediaSetWrapper implements ContentListener public ClusterAlbumSet(Path path, GalleryApp application, MediaSet baseSet, int kind) { - super(baseSet, path, INVALID_DATA_VERSION); + super(path, INVALID_DATA_VERSION); mApplication = application; mBaseSet = baseSet; mKind = kind; @@ -58,20 +58,17 @@ public class ClusterAlbumSet extends MediaSetWrapper implements ContentListener } @Override - protected boolean isDirtyLocked() { - return super.isDirtyLocked() - || !mFirstReloadDone; - } - - @Override - public void load() throws InterruptedException { - super.load(); - if (mFirstReloadDone) { - updateClustersContents(); - } else { - updateClusters(); - mFirstReloadDone = true; + public long reload() { + if (mBaseSet.reload() > mDataVersion) { + if (mFirstReloadDone) { + updateClustersContents(); + } else { + updateClusters(); + mFirstReloadDone = true; + } + mDataVersion = nextVersionNumber(); } + return mDataVersion; } @Override |