diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-30 05:42:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-30 05:42:35 -0700 |
| commit | 656103b3cd13b479664dcb374236b5b897036d1b (patch) | |
| tree | bb7eb92385ec0c492d8a40934368a50b2f328bdd | |
| parent | 06a7c47cf396da541523b0b2115d9f56537d8de5 (diff) | |
| parent | cb725ec9c662b9e53aad9135334b656a494fee01 (diff) | |
| download | android_packages_apps_Gallery2-656103b3cd13b479664dcb374236b5b897036d1b.tar.gz android_packages_apps_Gallery2-656103b3cd13b479664dcb374236b5b897036d1b.tar.bz2 android_packages_apps_Gallery2-656103b3cd13b479664dcb374236b5b897036d1b.zip | |
Merge "SnapdragonGallery: optimize SlideShow start speed" into android_ui.lnx.2.1-dev
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/data/FilterTypeSet.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/FilterTypeSet.java b/src/com/android/gallery3d/data/FilterTypeSet.java index e778ceb12..50a7c6964 100644..100755 --- a/src/com/android/gallery3d/data/FilterTypeSet.java +++ b/src/com/android/gallery3d/data/FilterTypeSet.java @@ -64,6 +64,10 @@ public class FilterTypeSet extends MediaSet implements ContentListener { mPaths, start, count, mDataManager); } + public ArrayList<Path> getPaths() { + return mPaths; + } + @Override public long reload() { if (mBaseSet.reload() > mDataVersion) { @@ -88,12 +92,18 @@ public class FilterTypeSet extends MediaSet implements ContentListener { String filteredPath = basePath + "/{" + set.getPath().toString() + "}"; MediaSet filteredSet = mDataManager.getMediaSet(filteredPath); filteredSet.reload(); + if (filteredSet instanceof FilterTypeSet && ((FilterTypeSet)filteredSet).getPaths() != null) { + mPaths.addAll(((FilterTypeSet)filteredSet).getPaths()); + } if (filteredSet.getMediaItemCount() > 0 || filteredSet.getSubMediaSetCount() > 0) { mAlbums.add(filteredSet); } } + if (mPaths.size() > 0) { + return; + } // Items mPaths.clear(); final int total = mBaseSet.getMediaItemCount(); |