diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-09 13:21:34 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 13:21:34 -0700 |
commit | 8a3f6f388a1d15ec12ebfe1c1dcfb52597cb92c7 (patch) | |
tree | 024fd844da7d8b31354bdb92ee7e92fea17a2ead | |
parent | e1060376749a38dfffcdc9175553097fe13aa027 (diff) | |
parent | 6cd102dd389b9dc51d6cc3d5f67e36494565a363 (diff) | |
download | android_packages_apps_Snap-8a3f6f388a1d15ec12ebfe1c1dcfb52597cb92c7.tar.gz android_packages_apps_Snap-8a3f6f388a1d15ec12ebfe1c1dcfb52597cb92c7.tar.bz2 android_packages_apps_Snap-8a3f6f388a1d15ec12ebfe1c1dcfb52597cb92c7.zip |
Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
-rw-r--r-- | src/com/android/gallery3d/data/ImageCacheService.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/util/GalleryUtils.java | 6 |
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); } |