diff options
| author | Alan Newberger <alann@google.com> | 2014-09-23 16:43:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 16:43:59 +0000 |
| commit | b60af188e3bc712a7f06700c591c428834237dff (patch) | |
| tree | 25e9fa302d6abde478b19b11b5673ca3a824f436 | |
| parent | 5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc (diff) | |
| parent | a62ed04fc1af31c1fdfa0e9ac9cc0acfec1b1f12 (diff) | |
| download | android_packages_apps_Camera2-b60af188e3bc712a7f06700c591c428834237dff.tar.gz android_packages_apps_Camera2-b60af188e3bc712a7f06700c591c428834237dff.tar.bz2 android_packages_apps_Camera2-b60af188e3bc712a7f06700c591c428834237dff.zip | |
Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
| -rw-r--r-- | src/com/android/camera/widget/FilmstripView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java index 371dcdb2b..5774ab397 100644 --- a/src/com/android/camera/widget/FilmstripView.java +++ b/src/com/android/camera/widget/FilmstripView.java @@ -797,8 +797,12 @@ public class FilmstripView extends ViewGroup { return null; } - int width = Math.round(mScale * getWidth()); - int height = Math.round(mScale * getHeight()); + // Always scale by fixed filmstrip scale, since we only show items when + // in filmstrip. Preloading images with a different scale and bounds + // interferes with caching. + int width = Math.round(FILM_STRIP_SCALE * getWidth()); + int height = Math.round(FILM_STRIP_SCALE * getHeight()); + Log.v(TAG, "suggesting item bounds: " + width + "x" + height); mDataAdapter.suggestViewSizeBound(width, height); data.prepare(); |