diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2012-10-19 18:48:22 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2012-10-22 11:18:50 -0700 |
| commit | d21977196891881e46fb40d3179cebcf24031db1 (patch) | |
| tree | 5184c75604356dc6834e578c24727883c5d5d6e5 /src | |
| parent | c4e553b141580b919125de12266db1b7b2926fad (diff) | |
| download | android_packages_apps_Snap-d21977196891881e46fb40d3179cebcf24031db1.tar.gz android_packages_apps_Snap-d21977196891881e46fb40d3179cebcf24031db1.tar.bz2 android_packages_apps_Snap-d21977196891881e46fb40d3179cebcf24031db1.zip | |
Fix to ensure visible history adapter strings are from xml.
Bug: 7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 9 |
1 files changed, 7 insertions, 2 deletions
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; |