summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-09 17:47:24 -0700
committerJohn Hoford <hoford@google.com>2013-04-09 17:47:24 -0700
commit495618d3f372c4e7ee8d0c065ad3e02b780b6d1d (patch)
tree4522fbddd4831a5e0d685387512b9dd3f4ab7fe8 /src/com/android/gallery3d
parent23ac64db523ea75c0ad7b55af2b59ec97dda79ef (diff)
downloadandroid_packages_apps_Snap-495618d3f372c4e7ee8d0c065ad3e02b780b6d1d.tar.gz
android_packages_apps_Snap-495618d3f372c4e7ee8d0c065ad3e02b780b6d1d.tar.bz2
android_packages_apps_Snap-495618d3f372c4e7ee8d0c065ad3e02b780b6d1d.zip
support icon styles
Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java6
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java2
2 files changed, 7 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 {
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index a35a18a7d..2858ea6e5 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -39,6 +39,8 @@ public class ImagePreset {
public static final int QUALITY_ICON = 0;
public static final int QUALITY_PREVIEW = 1;
public static final int QUALITY_FINAL = 2;
+ public static final int STYLE_ICON = 3;
+
private ImageLoader mImageLoader = null;
private Vector<FilterRepresentation> mFilters = new Vector<FilterRepresentation>();