diff options
author | nicolasroard <nicolasroard@google.com> | 2012-09-29 00:17:09 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2012-09-29 16:58:46 -0700 |
commit | ba1ba19c27e90694f74985b37b7bcaea6c023621 (patch) | |
tree | 218b076aa0d4846485a3339910f25d4cf6bee259 /src | |
parent | 7a9f7461af80edd31e5592d78bc7c6086cbfc3d7 (diff) | |
download | android_packages_apps_Snap-ba1ba19c27e90694f74985b37b7bcaea6c023621.tar.gz android_packages_apps_Snap-ba1ba19c27e90694f74985b37b7bcaea6c023621.tar.bz2 android_packages_apps_Snap-ba1ba19c27e90694f74985b37b7bcaea6c023621.zip |
Fix border bug and filter application
- fix layout (use framelayout)
- fix copy imagepreset
- added a current image state panel
- remove title for border images for now
bug:7256090
bug:7249672
bug:7234317
bug:7225150
Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 6659eaecf..69b3f0939 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -7,6 +7,7 @@ import android.graphics.Bitmap; import android.graphics.RectF; import android.util.Log; +import com.android.gallery3d.filtershow.ImageStateAdapter; import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.filters.ImageFilterStraighten; import com.android.gallery3d.filtershow.imageshow.ImageShow; @@ -36,8 +37,12 @@ public class ImagePreset { } public ImagePreset(ImagePreset source) { - for (int i = 0; i < source.mFilters.size(); i++) { - add(source.mFilters.elementAt(i).copy()); + try { + for (int i = 0; i < source.mFilters.size(); i++) { + add(source.mFilters.elementAt(i).clone()); + } + } catch (java.lang.CloneNotSupportedException e) { + Log.v(LOGTAG, "Exception trying to clone: " + e); } mName = source.name(); mHistoryName = source.name(); @@ -59,9 +64,6 @@ public class ImagePreset { // TODO } -// Log.v(LOGTAG, "applyGeometry with rotate " + mStraightenRotate + " and zoom " - // + mStraightenZoom); - if (mStraightenRotate != 0) { // TODO: keep the instances around ImageFilter straighten = new ImageFilterStraighten(mStraightenRotate, mStraightenZoom); @@ -117,8 +119,8 @@ public class ImagePreset { return mHistoryName; } - public void add(ImageFilter preset) { - mFilters.add(preset); + public void add(ImageFilter filter) { + mFilters.add(filter); } public void remove(String filterName) { @@ -135,7 +137,7 @@ public class ImagePreset { public ImageFilter getFilter(String name) { for (int i = 0; i < mFilters.size(); i++) { ImageFilter filter = mFilters.elementAt(i); - if (filter.name().equalsIgnoreCase(name)) { + if (filter.getName().equalsIgnoreCase(name)) { return filter; } } @@ -158,7 +160,7 @@ public class ImagePreset { ImageFilter borderFilter = null; for (int i = 0; i < mFilters.size(); i++) { ImageFilter filter = mFilters.elementAt(i); - if (filter.name().equalsIgnoreCase("Border")) { + if (filter.getName().equalsIgnoreCase("Border")) { // TODO don't use the name as an id borderFilter = filter; } else { @@ -174,4 +176,13 @@ public class ImagePreset { return bitmap; } - } + public void fillImageStateAdapter(ImageStateAdapter imageStateAdapter) { + if (imageStateAdapter == null) { + return; + } + imageStateAdapter.clear(); + imageStateAdapter.addAll(mFilters); + imageStateAdapter.notifyDataSetChanged(); + } + +} |