summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-09-17 11:13:48 -0700
committerJohn Hoford <hoford@google.com>2013-09-17 12:44:18 -0700
commit8a0072e519157b976d7d1fd34ca2aa1c849a983b (patch)
treec720e5a7e3145a32d481c4bbf11f428579dbce3f /src
parent6aea6b7f4014968fc414554c1530b16437364c80 (diff)
downloadandroid_packages_apps_Gallery2-8a0072e519157b976d7d1fd34ca2aa1c849a983b.tar.gz
android_packages_apps_Gallery2-8a0072e519157b976d7d1fd34ca2aa1c849a983b.tar.bz2
android_packages_apps_Gallery2-8a0072e519157b976d7d1fd34ca2aa1c849a983b.zip
remove translation in jason encoding
Change-Id: I26c1ae312b3ba71efc40fe0675f53d6b2c377bed
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/data/UserPresetsManager.java2
-rw-r--r--src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java1
-rw-r--r--src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java2
-rw-r--r--src/com/android/gallery3d/filtershow/tools/XmpPresets.java3
4 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java b/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java
index f36509dad..6232a2d15 100644
--- a/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java
+++ b/src/com/android/gallery3d/filtershow/data/UserPresetsManager.java
@@ -89,7 +89,7 @@ public class UserPresetsManager implements Handler.Callback {
public void save(ImagePreset preset, String name) {
Message msg = mProcessingHandler.obtainMessage(SAVE);
SaveOperation op = new SaveOperation();
- op.json = preset.getJsonString(mActivity.getString(R.string.saved));
+ op.json = preset.getJsonString(ImagePreset.JASON_SAVED);
op.name = name;
msg.obj = op;
mProcessingHandler.sendMessage(msg);
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 657871300..736733451 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -53,6 +53,7 @@ import java.util.Vector;
public class ImagePreset {
private static final String LOGTAG = "ImagePreset";
+ public static final String JASON_SAVED = "Saved";
private Vector<FilterRepresentation> mFilters = new Vector<FilterRepresentation>();
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
index 7d3767ae4..c6a4f80b1 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
@@ -152,7 +152,7 @@ public class ProcessingService extends Service {
processIntent.putExtra(ProcessingService.DESTINATION_FILE, destination.toString());
}
processIntent.putExtra(ProcessingService.PRESET,
- preset.getJsonString(context.getString(R.string.saved)));
+ preset.getJsonString(ImagePreset.JASON_SAVED));
processIntent.putExtra(ProcessingService.SAVING, true);
if (doFlatten) {
processIntent.putExtra(ProcessingService.FLATTEN, true);
diff --git a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
index d7c3153f2..fdf476c15 100644
--- a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
+++ b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
@@ -39,6 +39,7 @@ public class XmpPresets {
public static final String XMP_GOOGLE_FILTER_PREFIX = "AFltr";
public static final String XMP_SRC_FILE_URI = "SourceFileUri";
public static final String XMP_FILTERSTACK = "filterstack";
+
private static final String LOGTAG = "XmpPresets";
public static class XMresults {
@@ -76,7 +77,7 @@ public class XmpPresets {
xmpMeta.setProperty(XMP_GOOGLE_FILTER_NAMESPACE,
XMP_SRC_FILE_URI, srcUri.toString());
xmpMeta.setProperty(XMP_GOOGLE_FILTER_NAMESPACE,
- XMP_FILTERSTACK, preset.getJsonString(context.getString(R.string.saved)));
+ XMP_FILTERSTACK, ImagePreset.JASON_SAVED);
} catch (XMPException e) {
Log.v(LOGTAG, "Write XMP meta to file failed:" + dstFile.getAbsolutePath());
return;