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/app | |
| 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/app')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/AlbumDataLoader.java b/src/com/android/gallery3d/app/AlbumDataLoader.java index 77fd0db8a..28a822830 100644 --- a/src/com/android/gallery3d/app/AlbumDataLoader.java +++ b/src/com/android/gallery3d/app/AlbumDataLoader.java @@ -368,7 +368,7 @@ public class AlbumDataLoader { mDirty = false; } updateLoading(true); - long version = mSource.loadIfDirty(); + long version = mSource.reload(); UpdateInfo info = executeAndWait(new GetUpdateInfo(version)); updateComplete = info == null; if (updateComplete) continue; diff --git a/src/com/android/gallery3d/app/AlbumSetDataLoader.java b/src/com/android/gallery3d/app/AlbumSetDataLoader.java index 8c73d4ef5..cf380f812 100644 --- a/src/com/android/gallery3d/app/AlbumSetDataLoader.java +++ b/src/com/android/gallery3d/app/AlbumSetDataLoader.java @@ -343,7 +343,7 @@ public class AlbumSetDataLoader { while (mActive) { synchronized (this) { if (mActive && !mDirty && updateComplete) { - updateLoading(false); + if (!mSource.isLoading()) updateLoading(false); Utils.waitWithoutInterrupt(this); continue; } @@ -351,7 +351,7 @@ public class AlbumSetDataLoader { mDirty = false; updateLoading(true); - long version = mSource.loadIfDirty(); + long version = mSource.reload(); UpdateInfo info = executeAndWait(new GetUpdateInfo(version)); updateComplete = info == null; if (updateComplete) continue; diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java index d409315d1..fd3a7cf73 100644 --- a/src/com/android/gallery3d/app/PhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java @@ -1032,7 +1032,7 @@ public class PhotoDataAdapter implements PhotoPage.Model { mDirty = false; UpdateInfo info = executeAndWait(new GetUpdateInfo()); updateLoading(true); - long version = mSource.loadIfDirty(); + long version = mSource.reload(); if (info.version != version) { info.reloadContent = true; info.size = mSource.getMediaItemCount(); diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index 51bc70feb..54aae67ab 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -272,7 +272,7 @@ public class SlideshowPage extends ActivityState { @Override public long reload() { - long version = mMediaSet.loadIfDirty(); + long version = mMediaSet.reload(); if (version != mSourceVersion) { mSourceVersion = version; int count = mMediaSet.getTotalMediaItemCount(); @@ -346,7 +346,7 @@ public class SlideshowPage extends ActivityState { @Override public long reload() { - long version = mMediaSet.loadIfDirty(); + long version = mMediaSet.reload(); if (version != mDataVersion) { mDataVersion = version; mData.clear(); |