diff options
| author | John Hoford <hoford@google.com> | 2013-04-10 00:56:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-10 00:56:33 +0000 |
| commit | 6ff650fd8ef417e5bdd181ebad0cbfa15fdb25c6 (patch) | |
| tree | d35680000226e3e2a2fe12eda5c30eede156efe4 | |
| parent | 77c6b786faf522a1cb5b214e9070553e3a690ca6 (diff) | |
| parent | 495618d3f372c4e7ee8d0c065ad3e02b780b6d1d (diff) | |
| download | android_packages_apps_Snap-6ff650fd8ef417e5bdd181ebad0cbfa15fdb25c6.tar.gz android_packages_apps_Snap-6ff650fd8ef417e5bdd181ebad0cbfa15fdb25c6.tar.bz2 android_packages_apps_Snap-6ff650fd8ef417e5bdd181ebad0cbfa15fdb25c6.zip | |
Merge "support icon styles" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 6 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 2 |
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>(); |