Merge "Fix the save button issue." into gb-ub-photos-carlsbad
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 5a0100d..4ec39f7 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -59,7 +59,7 @@
private boolean mPartialRendering = false;
private Rect mPartialRenderingBounds;
- private static final boolean DEBUG = false;
+ private static final boolean DEBUG = true;
public ImagePreset() {
}
@@ -689,7 +689,7 @@
Log.w(LOGTAG,"UNKNOWN FILTER! "+name);
return false;
}
- filter.deSerializeRepresentation(read(sreader));
+ filter.deSerializeRepresentation(sreader);
addFilter(filter);
}
sreader.endObject();
@@ -703,18 +703,4 @@
FiltersManager filtersManager = FiltersManager.getManager();
return filtersManager.createFilterFromName(name);
}
-
- String[][] read(JsonReader reader) throws IOException {
- ArrayList <String[]> al = new ArrayList<String[]>();
-
- reader.beginObject();
-
- while (reader.hasNext()) {
- String[]kv = { reader.nextName(),reader.nextString()};
- al.add(kv);
-
- }
- reader.endObject();
- return al.toArray(new String[al.size()][]);
- }
}