summaryrefslogtreecommitdiffstats
path: root/src_pd/com/android/gallery3d
diff options
context:
space:
mode:
Diffstat (limited to 'src_pd/com/android/gallery3d')
-rw-r--r--src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java4
-rw-r--r--src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java21
2 files changed, 21 insertions, 4 deletions
diff --git a/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java b/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
index 92962cbb1..2a39b688f 100644
--- a/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
+++ b/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
@@ -29,6 +29,10 @@ public class EditorManager {
editorPlaceHolder.addEditor(new EditorTinyPlanet());
editorPlaceHolder.addEditor(new EditorDraw());
editorPlaceHolder.addEditor(new EditorVignette());
+ editorPlaceHolder.addEditor(new EditorFlip());
+ editorPlaceHolder.addEditor(new EditorRotate());
+ editorPlaceHolder.addEditor(new EditorStraighten());
+ editorPlaceHolder.addEditor(new EditorCrop());
}
}
diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
index 988cf2d81..d6b871899 100644
--- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
+++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
@@ -16,13 +16,26 @@
package com.android.gallery3d.filtershow.filters;
+import java.util.HashMap;
+import java.util.Vector;
+
public class FiltersManager extends BaseFiltersManager {
- private static FiltersManager gInstance = null;
+ private static FiltersManager sInstance = null;
+
+ protected FiltersManager() {
+ mFilters = new HashMap<Class, ImageFilter>();
+ addFilters(mFilters);
+ }
public static FiltersManager getManager() {
- if (gInstance == null) {
- gInstance = new FiltersManager();
+ if (sInstance == null) {
+ sInstance = new FiltersManager();
}
- return gInstance;
+ return sInstance;
}
+
+ public static void reset() {
+ sInstance = null;
+ }
+
}