summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-10 00:56:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-10 00:56:33 +0000
commit0f095dbd21725f646fce60f14bd954e5aceead24 (patch)
tree3c1c095d8b4e3bd665a2ec6ccba2c32ba88a60d0 /src/com/android/gallery3d/filtershow/filters
parentc79fcc2ee8741705fc00849c66d06561f2219fc7 (diff)
parent49a6d76f505148e1b3a4842bd358cc155c051c74 (diff)
downloadandroid_packages_apps_Snap-0f095dbd21725f646fce60f14bd954e5aceead24.tar.gz
android_packages_apps_Snap-0f095dbd21725f646fce60f14bd954e5aceead24.tar.bz2
android_packages_apps_Snap-0f095dbd21725f646fce60f14bd954e5aceead24.zip
Merge "support icon styles" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 7e0e25d61..5bb0e5733 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -42,7 +42,7 @@ public class FilterRepresentation implements Cloneable {
public static final byte TYPE_NORMAL = 5;
public static final byte TYPE_TINYPLANET = 6;
- public FilterRepresentation mTempRepresentation = null;
+ private FilterRepresentation mTempRepresentation = null;
public FilterRepresentation(String name) {
mName = name;
@@ -127,6 +127,10 @@ public class FilterRepresentation implements Cloneable {
public void useParametersFrom(FilterRepresentation a) {
}
+ public void clearTempRepresentation() {
+ mTempRepresentation = null;
+ }
+
public synchronized void updateTempParametersFrom(FilterRepresentation representation) {
if (mTempRepresentation == null) {
try {