summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/ui
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-02-11 09:55:33 -0800
committernicolasroard <nicolasroard@google.com>2013-02-11 13:49:11 -0800
commit9c37635183f7908746982a191005d53f8efb71d6 (patch)
treee6ac821b75444915c60f3ece6fd4068fc26f26bb /src/com/android/gallery3d/filtershow/ui
parent2b74cb3e2fbdde0a818eca06645b4a55553e371e (diff)
downloadandroid_packages_apps_Snap-9c37635183f7908746982a191005d53f8efb71d6.tar.gz
android_packages_apps_Snap-9c37635183f7908746982a191005d53f8efb71d6.tar.bz2
android_packages_apps_Snap-9c37635183f7908746982a191005d53f8efb71d6.zip
Cleaning filters
Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
Diffstat (limited to 'src/com/android/gallery3d/filtershow/ui')
-rw-r--r--src/com/android/gallery3d/filtershow/ui/FilterIconButton.java12
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());
+ }
}
}