diff options
author | John Reck <jreck@google.com> | 2013-01-16 14:10:30 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2013-01-16 18:05:07 -0800 |
commit | 9686d9d07e344fae2f2310ca544e5401b5e11d30 (patch) | |
tree | 7bc66a807f33e3aa016d0e9c977f85cfffbe62f1 /src/com/android/gallery3d/app | |
parent | 9003bd581c00a31db4c8291c99a30d5e74fe2dde (diff) | |
download | android_packages_apps_Snap-9686d9d07e344fae2f2310ca544e5401b5e11d30.tar.gz android_packages_apps_Snap-9686d9d07e344fae2f2310ca544e5401b5e11d30.tar.bz2 android_packages_apps_Snap-9686d9d07e344fae2f2310ca544e5401b5e11d30.zip |
New loading model
Rename reload() to loadIfDirty()
loadIfDirty is implemented by MediaSet and is final
loadIfDirty is now blocking instead of async
Subclasses must implement two protected methods, isDirtyLocked() and load()
The change from async reload() to sync loadIfDirty() should be fine since
all users of reload() were doing so from a background thread already, and the
longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so
Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
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 28a822830..77fd0db8a 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.reload(); + long version = mSource.loadIfDirty(); 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 cf380f812..8c73d4ef5 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) { - if (!mSource.isLoading()) updateLoading(false); + updateLoading(false); Utils.waitWithoutInterrupt(this); continue; } @@ -351,7 +351,7 @@ public class AlbumSetDataLoader { mDirty = false; updateLoading(true); - long version = mSource.reload(); + long version = mSource.loadIfDirty(); 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 2b586da94..faff14674 100644 --- a/src/com/android/gallery3d/app/PhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java @@ -1033,7 +1033,7 @@ public class PhotoDataAdapter implements PhotoPage.Model { mDirty = false; UpdateInfo info = executeAndWait(new GetUpdateInfo()); updateLoading(true); - long version = mSource.reload(); + long version = mSource.loadIfDirty(); 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 54aae67ab..51bc70feb 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.reload(); + long version = mMediaSet.loadIfDirty(); 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.reload(); + long version = mMediaSet.loadIfDirty(); if (version != mDataVersion) { mDataVersion = version; mData.clear(); |