diff options
| author | John Reck <jreck@google.com> | 2013-03-22 00:38:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-22 00:38:53 +0000 |
| commit | dc19e2f107b02b62f887dc500e107ad8f4a9cb07 (patch) | |
| tree | d4ef5575e5d2459462cd4d35aa1052779cbdc9a1 /src/com/android/photos | |
| parent | 400f35866b8758118e35541aa834b93fcfc5d1be (diff) | |
| parent | 51177aac9078da153bcb191864fb368faf105681 (diff) | |
| download | android_packages_apps_Snap-dc19e2f107b02b62f887dc500e107ad8f4a9cb07.tar.gz android_packages_apps_Snap-dc19e2f107b02b62f887dc500e107ad8f4a9cb07.tar.bz2 android_packages_apps_Snap-dc19e2f107b02b62f887dc500e107ad8f4a9cb07.zip | |
Merge "Revert "New loading model"" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/photos')
| -rw-r--r-- | src/com/android/photos/shims/MediaItemsLoader.java | 3 | ||||
| -rw-r--r-- | src/com/android/photos/shims/MediaSetLoader.java | 5 |
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(); |