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 | 51177aac9078da153bcb191864fb368faf105681 (patch) | |
tree | 0b4774e431a7a27e7a26f93afda8e68ba4b7e058 /src/com/android/gallery3d/data/ComboAlbumSet.java | |
parent | 03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2 (diff) | |
download | android_packages_apps_Snap-51177aac9078da153bcb191864fb368faf105681.tar.gz android_packages_apps_Snap-51177aac9078da153bcb191864fb368faf105681.tar.bz2 android_packages_apps_Snap-51177aac9078da153bcb191864fb368faf105681.zip |
Revert "New loading model"
Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
Diffstat (limited to 'src/com/android/gallery3d/data/ComboAlbumSet.java')
-rw-r--r-- | src/com/android/gallery3d/data/ComboAlbumSet.java | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/com/android/gallery3d/data/ComboAlbumSet.java b/src/com/android/gallery3d/data/ComboAlbumSet.java index 528ffcf41..3f3674500 100644 --- a/src/com/android/gallery3d/data/ComboAlbumSet.java +++ b/src/com/android/gallery3d/data/ComboAlbumSet.java @@ -27,13 +27,11 @@ public class ComboAlbumSet extends MediaSet implements ContentListener { @SuppressWarnings("unused") private static final String TAG = "ComboAlbumSet"; private final MediaSet[] mSets; - private final boolean[] mDirtySets; private final String mName; public ComboAlbumSet(Path path, GalleryApp application, MediaSet[] mediaSets) { super(path, nextVersionNumber()); mSets = mediaSets; - mDirtySets = new boolean[mSets.length]; for (MediaSet set : mSets) { set.addContentListener(this); } @@ -68,24 +66,22 @@ public class ComboAlbumSet extends MediaSet implements ContentListener { } @Override - protected boolean isDirtyLocked() { - boolean dirty = false; - for (int i = 0; i < mSets.length; i++) { - mDirtySets[i] = mSets[i].isDirtyLocked(); - dirty |= mDirtySets[i] - || mSets[i].getDataVersion() > getDataVersion(); + public boolean isLoading() { + for (int i = 0, n = mSets.length; i < n; ++i) { + if (mSets[i].isLoading()) return true; } - return dirty; + return false; } @Override - protected void load() throws InterruptedException { + public long reload() { + boolean changed = false; for (int i = 0, n = mSets.length; i < n; ++i) { - if (mDirtySets[i]) { - mDirtySets[i] = false; - mSets[i].load(); - } + long version = mSets[i].reload(); + if (version > mDataVersion) changed = true; } + if (changed) mDataVersion = nextVersionNumber(); + return mDataVersion; } @Override |