Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbad
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
index 99e1edf..d9e2117 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
@@ -76,7 +76,7 @@
return false;
}
- public boolean allowsMultipleInstances() {
+ public boolean allowsSingleInstanceOnly() {
return true;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index abe69d1..a7efbca 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -86,7 +86,7 @@
}
@Override
- public boolean allowsMultipleInstances() {
+ public boolean allowsSingleInstanceOnly() {
return true;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
index d790d3e..c32f7cc 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
@@ -71,7 +71,7 @@
return R.string.none;
}
- public boolean allowsMultipleInstances() {
+ public boolean allowsSingleInstanceOnly() {
return true;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 9d103d5..b192b5a 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -73,7 +73,7 @@
if (representation == null) {
return false;
}
- if (representation.mFilterClass == representation.mFilterClass
+ if (representation.mFilterClass == mFilterClass
&& representation.mName.equalsIgnoreCase(mName)
&& representation.mPriority == mPriority
&& representation.mSupportsPartialRendering == mSupportsPartialRendering
@@ -154,7 +154,7 @@
}
}
- public boolean allowsMultipleInstances() {
+ public boolean allowsSingleInstanceOnly() {
return false;
}