diff options
| author | John Hoford <hoford@google.com> | 2012-10-11 12:55:05 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2012-10-11 13:39:13 -0700 |
| commit | 4006377c78dfa97a973cfd985dae99f5de06b838 (patch) | |
| tree | f1cd3eb36092040d928cdcdc86aaf4945050ed0c /src | |
| parent | f6bd896c681524675dfe2514cf86cc74bbb13b30 (diff) | |
| download | android_packages_apps_Snap-4006377c78dfa97a973cfd985dae99f5de06b838.tar.gz android_packages_apps_Snap-4006377c78dfa97a973cfd985dae99f5de06b838.tar.bz2 android_packages_apps_Snap-4006377c78dfa97a973cfd985dae99f5de06b838.zip | |
fixed manta image size and double FX issue
bug:7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 0ddb0170f..18aa1fb1d 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -122,32 +122,38 @@ public class ImagePreset { } public void add(ImageFilter filter) { + if (filter.getFilterType() == ImageFilter.TYPE_BORDER){ setHistoryName("Border"); setBorder(filter); } else if (filter.getFilterType() == ImageFilter.TYPE_FX){ - Vector<ImageFilter> fl = mFilters; + boolean found = false; for (int i = 0; i < mFilters.size(); i++) { - byte type = fl.get(i).getFilterType(); + byte type = mFilters.get(i).getFilterType(); if (found) { if (type != ImageFilter.TYPE_VIGNETTE){ - fl.remove(i); + mFilters.remove(i); + continue; } - } else if (type==ImageFilter.TYPE_FX){ - fl.remove(i); - fl.add(i, filter); + } + if (type==ImageFilter.TYPE_FX){ + mFilters.remove(i); + mFilters.add(i, filter); setHistoryName(filter.getName()); found = true; } } - mFilters.add(filter); - setHistoryName(filter.getName()); + if (!found) { + mFilters.add(filter); + setHistoryName(filter.getName()); + } } else { mFilters.add(filter); setHistoryName(filter.getName()); } + } public void remove(String filterName) { |