diff options
author | John Hoford <hoford@google.com> | 2012-10-16 17:09:27 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2012-10-17 09:52:59 -0700 |
commit | 7fc37252be8d12de906a9c68224f553f80c8ef52 (patch) | |
tree | 64073eb5bac8d911e22795bd0e89a1b3b748cebd /src/com/android/gallery3d/filtershow/filters | |
parent | 482038206b6677816b7030c3dbbc2a61ad2c9a84 (diff) | |
download | android_packages_apps_Snap-7fc37252be8d12de906a9c68224f553f80c8ef52.tar.gz android_packages_apps_Snap-7fc37252be8d12de906a9c68224f553f80c8ef52.tar.bz2 android_packages_apps_Snap-7fc37252be8d12de906a9c68224f553f80c8ef52.zip |
add support for configurable slider ranges
bug:7293391
Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
3 files changed, 33 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java index 6d0c020a7..36f2b104f 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java @@ -5,6 +5,9 @@ import android.graphics.Bitmap; public class ImageFilter implements Cloneable { + protected int mMaxParameter = 100; + protected int mMinParameter = -100; + protected int mDefaultParameter = 0; protected int mParameter = 0; protected String mName = "Original"; private final String LOGTAG = "ImageFilter"; @@ -29,6 +32,9 @@ public class ImageFilter implements Cloneable { filter.setName(getName()); filter.setParameter(getParameter()); filter.setFilterType(filterType); + filter.mMaxParameter = mMaxParameter; + filter.mMinParameter = mMinParameter; + filter.mDefaultParameter = mDefaultParameter; return filter; } @@ -53,6 +59,30 @@ public class ImageFilter implements Cloneable { mParameter = value; } + /** + * The maximum allowed value (inclusive) + * @return maximum value allowed as input to this filter + */ + public int getMaxParameter(){ + return mMaxParameter; + } + + /** + * The minimum allowed value (inclusive) + * @return minimum value allowed as input to this filter + */ + public int getMinParameter(){ + return mMinParameter; + } + + /** + * Returns the default value returned by this filter. + * @return default value + */ + public int getDefaultParameter(){ + return mDefaultParameter; + } + public boolean same(ImageFilter filter) { if (!filter.getName().equalsIgnoreCase(getName())) { return false; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java index 7d8f41537..93cde1fe5 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java @@ -12,7 +12,7 @@ import java.util.Arrays; public class ImageFilterFx extends ImageFilter { private static final String TAG = "ImageFilterFx"; Bitmap fxBitmap; - public static final String ORIG = "Original"; + public ImageFilterFx(Bitmap fxBitmap,String name) { setFilterType(TYPE_FX); mName = name; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java index 6f6f9e875..e5e52ecd0 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java @@ -9,6 +9,8 @@ public class ImageFilterHue extends ImageFilter { public ImageFilterHue() { mName = "Hue"; cmatrix = new ColorSpaceMatrix(); + mMaxParameter = 180; + mMinParameter = -180; } @Override |