Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
diff --git a/src/com/android/gallery3d/data/ImageCacheService.java b/src/com/android/gallery3d/data/ImageCacheService.java
index f10a7b3..38e32cb 100644
--- a/src/com/android/gallery3d/data/ImageCacheService.java
+++ b/src/com/android/gallery3d/data/ImageCacheService.java
@@ -35,7 +35,7 @@
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 16eb424..1955521 100644
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -87,12 +87,10 @@
}
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);
}