Merge "Cleaning filters" into gb-ub-photos-bryce

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
index b78ab0373..681574c5d 100644
--- a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
+++ b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
@@ -62,10 +62,6 @@ public class FilterIconButton extends IconButton implements View.OnClickListener
             LinearLayout parent) {
         setup(text, controller, parent);
         mImageFilter = filter;
-        if (mImageFilter.getOverlayBitmaps() != 0) {
-            mOverlayBitmap = BitmapFactory.decodeResource(getResources(),
-                    mImageFilter.getOverlayBitmaps());
-        }
     }
 
     @Override
@@ -107,7 +103,15 @@ public class FilterIconButton extends IconButton implements View.OnClickListener
         return mImageFilter;
     }
 
+    public FilterRepresentation getFilterRepresentation() {
+        return mFilterRepresentation;
+    }
+
     public void setFilterRepresentation(FilterRepresentation filterRepresentation) {
         mFilterRepresentation = filterRepresentation;
+        if (mFilterRepresentation != null && mFilterRepresentation.getOverlayId() != 0) {
+            mOverlayBitmap = BitmapFactory.decodeResource(getResources(),
+                    mFilterRepresentation.getOverlayId());
+        }
     }
 }