Merge "Gallery: improve timeline loading performance" into android_ui.lnx.1.2-dev

1 files changed, 2 insertions, 11 deletions

diff --git a/src/com/android/gallery3d/data/TimeClustering.java b/src/com/android/gallery3d/data/TimeClustering.java
index 87111f29d..db47c40d9 100644
--- a/src/com/android/gallery3d/data/TimeClustering.java
+++ b/src/com/android/gallery3d/data/TimeClustering.java
@@ -98,14 +98,12 @@ public class TimeClustering extends Clustering {
 
     @Override
     public void run(MediaSet baseSet) {
-        final int total = baseSet.getTotalMediaItemCount();
-        final SmallItem[] buf = new SmallItem[total];
         final double[] latLng = new double[2];
 
+        final ArrayList<SmallItem> items = new ArrayList<>();
         baseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() {
             @Override
             public void consume(int index, MediaItem item) {
-                if (index < 0 || index >= total) return;
                 SmallItem s = new SmallItem();
                 s.path = item.getPath();
                 s.mediaType = item.getMediaType();
@@ -113,17 +111,10 @@ public class TimeClustering extends Clustering {
                 item.getLatLong(latLng);
                 s.lat = latLng[0];
                 s.lng = latLng[1];
-                buf[index] = s;
+                items.add(s);
             }
         });
 
-        ArrayList<SmallItem> items = new ArrayList<SmallItem>(total);
-        for (int i = 0; i < total; i++) {
-            if (buf[i] != null) {
-                items.add(buf[i]);
-            }
-        }
-
         Collections.sort(items, sDateComparator);
 
         int n = items.size();