am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches

* commit 'd490f1aa851db853b9865a380abd01c67605d58b':
  Dejank camera roll scrolling in grid view.

2 files changed, 3 insertions, 5 deletions

diff --git a/src/com/android/gallery3d/data/ImageCacheService.java b/src/com/android/gallery3d/data/ImageCacheService.java
index f10a7b3e6..38e32cbee 100644
--- a/src/com/android/gallery3d/data/ImageCacheService.java
+++ b/src/com/android/gallery3d/data/ImageCacheService.java
@@ -35,7 +35,7 @@ public class ImageCacheService {
     private static final String IMAGE_CACHE_FILE = "imgcache";
     private static final int IMAGE_CACHE_MAX_ENTRIES = 5000;
     private static final int IMAGE_CACHE_MAX_BYTES = 200 * 1024 * 1024;
-    private static final int IMAGE_CACHE_VERSION = 5;
+    private static final int IMAGE_CACHE_VERSION = 6;
 
     private BlobCache mCache;
 
diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java
index 16eb424b5..195552116 100644
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -87,12 +87,10 @@ public class GalleryUtils {
     }
 
     private static void initializeThumbnailSizes(DisplayMetrics metrics, Resources r) {
-        int minRows = Math.min(r.getInteger(R.integer.album_rows_land),
-                r.getInteger(R.integer.albumset_rows_land));
         int maxDimensionPixels = Math.max(metrics.heightPixels, metrics.widthPixels);
         // Never need to completely fill the screen
-        maxDimensionPixels = maxDimensionPixels * 3/4;
-        MediaItem.setThumbnailSizes(maxDimensionPixels, maxDimensionPixels / minRows);
+        maxDimensionPixels = maxDimensionPixels / 2;
+        MediaItem.setThumbnailSizes(maxDimensionPixels, 200);
         BitmapScreenNail.setMaxSide(maxDimensionPixels);
     }