Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f6cab7f authored by John Hoford's avatar John Hoford Committed by Android Git Automerger
Browse files

am 8a0072e5: remove translation in jason encoding 

* commit '8a0072e5':
  remove translation in jason encoding
parents 3edaea1a 8a0072e5

res/values/filtershow_strings.xml

+1 −3
Original line number Diff line number Diff line
@@ -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>

src/com/android/gallery3d/filtershow/data/UserPresetsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java

+1 −0
Original line number Diff line number Diff line
@@ -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>();

src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/gallery3d/filtershow/tools/XmpPresets.java

+2 −1
Original line number Diff line number Diff line
@@ -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;