diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-01-29 21:41:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-29 21:41:51 +0000 |
| commit | 4588a3cb75457f98b6b0fd1b7dc41e9db2079b16 (patch) | |
| tree | e00a51670a7c5d291f6e0510691030873dc6e1ef /src | |
| parent | 2da455143a4cb59d289f24c23b8f93c29da14fd0 (diff) | |
| parent | c03c4360a10ac519b00cc75dd02794536c72182b (diff) | |
| download | android_packages_apps_Gallery2-4588a3cb75457f98b6b0fd1b7dc41e9db2079b16.tar.gz android_packages_apps_Gallery2-4588a3cb75457f98b6b0fd1b7dc41e9db2079b16.tar.bz2 android_packages_apps_Gallery2-4588a3cb75457f98b6b0fd1b7dc41e9db2079b16.zip | |
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/ui/IconButton.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 1e2bad34e..654175210 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -418,7 +418,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, cannotLoadImage(); } - Bitmap bmap = mImageShow.getFilteredImage(); + Bitmap bmap = mImageLoader.getOriginalBitmapSmall(); if (bmap != null && bmap.getWidth() > 0 && bmap.getHeight() > 0) { float w = bmap.getWidth(); float h = bmap.getHeight(); diff --git a/src/com/android/gallery3d/filtershow/ui/IconButton.java b/src/com/android/gallery3d/filtershow/ui/IconButton.java index 1ebc1abda..55dfb8043 100644 --- a/src/com/android/gallery3d/filtershow/ui/IconButton.java +++ b/src/com/android/gallery3d/filtershow/ui/IconButton.java @@ -65,6 +65,7 @@ public class IconButton extends Button { public void setIcon(Bitmap image) { mImageMirror = image; stale_icon = true; + invalidate(); } /** |