summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-09-13 16:37:43 -0700
committernicolasroard <nicolasroard@google.com>2013-09-13 16:43:38 -0700
commitedf4b095a1d904df6c02d49e3ec575c5c3c9c749 (patch)
tree706ed60d1f330705ee574e2da437dbe1f29c7a3e /src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
parentbae1c10284c23598aa169c7acea0487632ba0da4 (diff)
downloadandroid_packages_apps_Gallery2-edf4b095a1d904df6c02d49e3ec575c5c3c9c749.tar.gz
android_packages_apps_Gallery2-edf4b095a1d904df6c02d49e3ec575c5c3c9c749.tar.bz2
android_packages_apps_Gallery2-edf4b095a1d904df6c02d49e3ec575c5c3c9c749.zip
Fix various UX bugs
- boolean filters (invert) working - default value for vignette - swappable views un-broken (use same mechanism as categories views) Change-Id: I65818c1febbf2c862e97542c8134a1188daf5d62
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index cc7ec881e..fc83e4f8c 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -38,6 +38,7 @@ public class FilterRepresentation {
private int mOverlayId = 0;
private boolean mOverlayOnly = false;
private boolean mShowParameterValue = true;
+ private boolean mIsBooleanFilter = false;
private String mSerializationName;
public static final byte TYPE_BORDER = 1;
public static final byte TYPE_FX = 2;
@@ -69,7 +70,7 @@ public class FilterRepresentation {
representation.setOverlayOnly(getOverlayOnly());
representation.setShowParameterValue(showParameterValue());
representation.mSerializationName = mSerializationName;
-
+ representation.setIsBooleanFilter(isBooleanFilter());
}
public boolean equals(FilterRepresentation representation) {
@@ -87,12 +88,21 @@ public class FilterRepresentation {
&& representation.mButtonId == mButtonId
&& representation.mOverlayId == mOverlayId
&& representation.mOverlayOnly == mOverlayOnly
- && representation.mShowParameterValue == mShowParameterValue) {
+ && representation.mShowParameterValue == mShowParameterValue
+ && representation.mIsBooleanFilter == mIsBooleanFilter) {
return true;
}
return false;
}
+ public boolean isBooleanFilter() {
+ return mIsBooleanFilter;
+ }
+
+ public void setIsBooleanFilter(boolean value) {
+ mIsBooleanFilter = value;
+ }
+
@Override
public String toString() {
return mName;