From 8a0072e519157b976d7d1fd34ca2aa1c849a983b Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 17 Sep 2013 11:13:48 -0700
Subject: [PATCH] remove translation in jason encoding

Change-Id: I26c1ae312b3ba71efc40fe0675f53d6b2c377bed
---
 res/values/filtershow_strings.xml                                    | 4 +---
 src/com/android/gallery3d/filtershow/data/UserPresetsManager.java    | 2 +-
 src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java       | 1 +
 src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java | 2 +-
 src/com/android/gallery3d/filtershow/tools/XmpPresets.java           | 3 ++-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 4093c4892..b561379f6 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -34,8 +34,6 @@
     <string name="download_failure">Could not download photo. Network unavailable.</string>
     <!--  Text for original image [CHAR LIMIT=20] -->
     <string name="original">Original</string>
-    <!--  Text for original image [CHAR LIMIT=20] -->
-    <string name="saved">Saved</string>
     <!--  Text for filters that apply a border to a picture [CHAR LIMIT=20] -->
     <string name="borders" msgid="4461692156695893616">Borders</string>
     <!-- Text for the custom border filter [CHAR LIMIT=20] -->
@@ -216,7 +214,7 @@
     <string name="editor_chan_sat_magenta">Magenta</string>
     <!--  Label for the image graduated filter effect  [CHAR LIMIT=20] -->
     <string name="editor_grad_style">Style</string>
-    <!--  Label for the image new grad layer  [CHAR LIMIT=20] -->
+    <!-- new virtual graduated neutral density filter  [CHAR LIMIT=20] -->
     <string name="editor_grad_new">new</string>
 
 
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;
-- 
2.11.0