summaryrefslogtreecommitdiffstats
path: root/src/com/android/photos
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-03-21 14:22:33 -0700
committerJohn Reck <jreck@google.com>2013-03-21 14:42:46 -0700
commit51177aac9078da153bcb191864fb368faf105681 (patch)
tree0b4774e431a7a27e7a26f93afda8e68ba4b7e058 /src/com/android/photos
parent03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2 (diff)
downloadandroid_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/photos')
-rw-r--r--src/com/android/photos/shims/MediaItemsLoader.java3
-rw-r--r--src/com/android/photos/shims/MediaSetLoader.java5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/photos/shims/MediaItemsLoader.java b/src/com/android/photos/shims/MediaItemsLoader.java
index d75823404..6142355a9 100644
--- a/src/com/android/photos/shims/MediaItemsLoader.java
+++ b/src/com/android/photos/shims/MediaItemsLoader.java
@@ -106,7 +106,8 @@ public class MediaItemsLoader extends AsyncTaskLoader<Cursor> implements LoaderC
@Override
public Cursor loadInBackground() {
- mMediaSet.loadIfDirty();
+ // TODO: This probably doesn't work
+ mMediaSet.reload();
final MatrixCursor cursor = new MatrixCursor(PhotoSetLoader.PROJECTION);
final Object[] row = new Object[PhotoSetLoader.PROJECTION.length];
final SparseArray<MediaItem> mediaItems = new SparseArray<MediaItem>();
diff --git a/src/com/android/photos/shims/MediaSetLoader.java b/src/com/android/photos/shims/MediaSetLoader.java
index d200807f9..9093bc139 100644
--- a/src/com/android/photos/shims/MediaSetLoader.java
+++ b/src/com/android/photos/shims/MediaSetLoader.java
@@ -104,14 +104,15 @@ public class MediaSetLoader extends AsyncTaskLoader<Cursor> implements LoaderCom
@Override
public Cursor loadInBackground() {
- mMediaSet.loadIfDirty();
+ // TODO: This probably doesn't work
+ mMediaSet.reload();
final MatrixCursor cursor = new MatrixCursor(AlbumSetLoader.PROJECTION);
final Object[] row = new Object[AlbumSetLoader.PROJECTION.length];
int count = mMediaSet.getSubMediaSetCount();
ArrayList<MediaItem> coverItems = new ArrayList<MediaItem>(count);
for (int i = 0; i < count; i++) {
MediaSet m = mMediaSet.getSubMediaSet(i);
- m.loadIfDirty();
+ m.reload();
row[AlbumSetLoader.INDEX_ID] = i;
row[AlbumSetLoader.INDEX_TITLE] = m.getName();
row[AlbumSetLoader.INDEX_COUNT] = m.getMediaItemCount();