diff options
| -rw-r--r-- | res/values/filtershow_strings.xml | 15 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 9 |
2 files changed, 19 insertions, 5 deletions
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index f6e4f4f8d..3862865ef 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -24,11 +24,18 @@ <!-- String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] --> <string name="cannot_load_image">Cannot load the image!</string> <!-- String displayed when showing the original image [CHAR LIMIT=NONE] --> - <string name="original_picture_text">Original</string> + <string name="original_picture_text">@string/original</string> + + <!-- generic strings --> + + <!-- Text for original image [CHAR LIMIT=20] --> + <string name="original">Original</string> + <!-- Text for filters that apply a border to a picture [CHAR LIMIT=20] --> + <string name="borders" msgid="4461692156695893616">Borders</string> <!-- actionbar menu --> - <!-- Text for the actionbar confirmation button [CHAR LIMIT=20] --> + <!-- Text for the actionbar confirmation button [CHAR LIMIT=20] --> <string name="done">Done</string> <!-- Text for the undo menu item [CHAR LIMIT=20] --> <string name="filtershow_undo">Undo</string> @@ -51,6 +58,8 @@ <string name="history">History</string> <!-- Text for the history panel reset button [CHAR LIMIT=20]--> <string name="reset">Reset</string> + <!-- Text for the original image[CHAR LIMIT=20]--> + <string name="history_original">@string/original</string> <!-- Image state panel --> @@ -78,7 +87,7 @@ <!-- Label for the aspect None effect [CHAR LIMIT=15] --> <string name="aspectNone_effect">None</string> <!-- Label for the aspect None effect [CHAR LIMIT=15] --> - <string name="aspectOriginal_effect">Original</string> + <string name="aspectOriginal_effect">@string/original</string> <!-- Label for the tuny planet effect [CHAR LIMIT=10] --> <string name="tinyplanet">Tiny Planet</string> diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 83e7c129a..cbb14300d 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -24,7 +24,7 @@ public class ImagePreset { protected Vector<ImageFilter> mFilters = new Vector<ImageFilter>(); protected String mName = "Original"; - protected String mHistoryName = "Original"; + private String mHistoryName = "Original"; protected boolean mIsFxPreset = false; public final GeometryMetadata mGeoData = new GeometryMetadata(); @@ -37,6 +37,11 @@ public class ImagePreset { setup(); } + public ImagePreset(String historyName) { + setHistoryName(historyName); + setup(); + } + public ImagePreset(ImagePreset source, String historyName) { this(source); if (historyName != null) { @@ -172,7 +177,7 @@ public class ImagePreset { public void add(ImageFilter filter) { if (filter.getFilterType() == ImageFilter.TYPE_BORDER) { - setHistoryName("Border"); + setHistoryName(filter.getName()); setBorder(filter); } else if (filter.getFilterType() == ImageFilter.TYPE_FX) { boolean found = false; |