diff options
28 files changed, 86 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java b/src/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java index d168a787f..b71da1920 100644 --- a/src/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class AutoFixFilter extends AbstractScaleFilter { public static final Creator<AutoFixFilter> CREATOR = creatorOf(AutoFixFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_AUTOFIX); effect.setParameter("scale", scale); diff --git a/src/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java b/src/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java index c5a6a35e4..960be416d 100644 --- a/src/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -30,6 +32,7 @@ public class ColorTemperatureFilter extends AbstractScaleFilter { ColorTemperatureFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_TEMPERATURE); effect.setParameter("scale", scale); diff --git a/src/com/android/gallery3d/photoeditor/filters/CropFilter.java b/src/com/android/gallery3d/photoeditor/filters/CropFilter.java index 00a6c424a..053998dfb 100644 --- a/src/com/android/gallery3d/photoeditor/filters/CropFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/CropFilter.java @@ -16,11 +16,13 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.graphics.RectF; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -40,6 +42,7 @@ public class CropFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { dst.changeDimension(Math.round(bounds.width() * src.width()), Math.round(bounds.height() * src.height())); diff --git a/src/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java b/src/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java index bc233daa2..9c3d49ad9 100644 --- a/src/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class CrossProcessFilter extends Filter { public static final Creator<CrossProcessFilter> CREATOR = creatorOf(CrossProcessFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_CROSSPROCESS).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java b/src/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java index d2e4c7cd0..1270defa3 100644 --- a/src/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class DocumentaryFilter extends Filter { public static final Creator<DocumentaryFilter> CREATOR = creatorOf(DocumentaryFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_DOCUMENTARY).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java b/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java index 61920d377..52e606130 100644 --- a/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java @@ -16,6 +16,7 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Matrix; @@ -26,6 +27,7 @@ import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; import com.android.gallery3d.photoeditor.actions.Doodle; @@ -45,6 +47,7 @@ public class DoodleFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Bitmap bitmap = Bitmap.createBitmap(src.width(), src.height(), Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(bitmap); diff --git a/src/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java b/src/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java index b2c55252e..9449d0925 100644 --- a/src/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java @@ -16,10 +16,12 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -38,6 +40,7 @@ public class DuotoneFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_DUOTONE); effect.setParameter("first_color", firstColor); diff --git a/src/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java b/src/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java index b7a1cf1c7..0687e7386 100644 --- a/src/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -31,6 +33,7 @@ public class FaceTanFilter extends AbstractScaleFilter { private static final String EFFECT_FACE_TANNING = "com.google.android.media.effect.effects.FaceTanningEffect"; @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EFFECT_FACE_TANNING); effect.setParameter("blend", scale); @@ -42,6 +45,7 @@ public class FaceTanFilter extends AbstractScaleFilter { * * @return boolean true if an effect is present in the system and can be loaded */ + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public static boolean isPresent() { return EffectFactory.isEffectSupported(EFFECT_FACE_TANNING); } diff --git a/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java b/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java index 3e4fad206..c714a544e 100644 --- a/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -31,6 +33,7 @@ public class FaceliftFilter extends AbstractScaleFilter { private static final String EFFECT_FACELIFT = "com.google.android.media.effect.effects.FaceliftEffect"; @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EFFECT_FACELIFT); effect.setParameter("blend", scale); @@ -42,6 +45,7 @@ public class FaceliftFilter extends AbstractScaleFilter { * * @return boolean true if an effect is present in the system and can be loaded */ + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public static boolean isPresent() { return EffectFactory.isEffectSupported(EFFECT_FACELIFT); } diff --git a/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java b/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java index 3aedd745e..3b128c074 100644 --- a/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class FillLightFilter extends AbstractScaleFilter { public static final Creator<FillLightFilter> CREATOR = creatorOf(FillLightFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_FILLLIGHT); effect.setParameter("strength", scale); diff --git a/src/com/android/gallery3d/photoeditor/filters/Filter.java b/src/com/android/gallery3d/photoeditor/filters/Filter.java index 5d1ac229b..4304caf68 100644 --- a/src/com/android/gallery3d/photoeditor/filters/Filter.java +++ b/src/com/android/gallery3d/photoeditor/filters/Filter.java @@ -16,11 +16,13 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectContext; import android.os.Parcel; import android.os.Parcelable; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; import java.util.HashMap; @@ -28,6 +30,7 @@ import java.util.HashMap; /** * Image filter for photo editing; all of its methods must be called from a single GL thread. */ +@TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public abstract class Filter implements Parcelable { // TODO: This should be set in MFF instead. diff --git a/src/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java b/src/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java index 7fe6108c9..3789b39c9 100644 --- a/src/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class FisheyeFilter extends AbstractScaleFilter { public static final Creator<FisheyeFilter> CREATOR = creatorOf(FisheyeFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_FISHEYE); effect.setParameter("scale", scale); diff --git a/src/com/android/gallery3d/photoeditor/filters/FlipFilter.java b/src/com/android/gallery3d/photoeditor/filters/FlipFilter.java index 9c325c1c9..efbdac50d 100644 --- a/src/com/android/gallery3d/photoeditor/filters/FlipFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/FlipFilter.java @@ -16,10 +16,12 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -37,6 +39,7 @@ public class FlipFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_FLIP); effect.setParameter("horizontal", flips[0]); diff --git a/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java b/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java index 04867c6ac..596d1b608 100644 --- a/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class GrainFilter extends AbstractScaleFilter { public static final Creator<GrainFilter> CREATOR = creatorOf(GrainFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_GRAIN); effect.setParameter("strength", scale); diff --git a/src/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java b/src/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java index b0e94ef7c..bf4f4c713 100644 --- a/src/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class GrayscaleFilter extends Filter { public static final Creator<GrayscaleFilter> CREATOR = creatorOf(GrayscaleFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_GRAYSCALE).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/HighlightFilter.java b/src/com/android/gallery3d/photoeditor/filters/HighlightFilter.java index e079c2e58..3d451f1dd 100644 --- a/src/com/android/gallery3d/photoeditor/filters/HighlightFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/HighlightFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class HighlightFilter extends AbstractScaleFilter { public static final Creator<HighlightFilter> CREATOR = creatorOf(HighlightFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_BLACKWHITE); effect.setParameter("black", 0f); diff --git a/src/com/android/gallery3d/photoeditor/filters/LomoishFilter.java b/src/com/android/gallery3d/photoeditor/filters/LomoishFilter.java index 16a1d61e9..594fd11eb 100644 --- a/src/com/android/gallery3d/photoeditor/filters/LomoishFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/LomoishFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class LomoishFilter extends Filter { public static final Creator<LomoishFilter> CREATOR = creatorOf(LomoishFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_LOMOISH).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/NegativeFilter.java b/src/com/android/gallery3d/photoeditor/filters/NegativeFilter.java index db702d7e3..327941b2f 100644 --- a/src/com/android/gallery3d/photoeditor/filters/NegativeFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/NegativeFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class NegativeFilter extends Filter { public static final Creator<NegativeFilter> CREATOR = creatorOf(NegativeFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_NEGATIVE).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java b/src/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java index 23e78bffb..805a87b45 100644 --- a/src/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class PosterizeFilter extends Filter { public static final Creator<PosterizeFilter> CREATOR = creatorOf(PosterizeFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_POSTERIZE).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java b/src/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java index 32e8f7c30..1bfcde5a7 100644 --- a/src/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java @@ -16,11 +16,13 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.graphics.PointF; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; import java.util.Vector; @@ -42,6 +44,7 @@ public class RedEyeFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_REDEYE); float[] centers = new float[redeyes.size() * 2]; diff --git a/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java b/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java index d820bdac6..a885e2538 100644 --- a/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java @@ -16,10 +16,12 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -39,6 +41,7 @@ public class RotateFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { if (degrees % 180 != 0) { dst.changeDimension(src.height(), src.width()); diff --git a/src/com/android/gallery3d/photoeditor/filters/SaturationFilter.java b/src/com/android/gallery3d/photoeditor/filters/SaturationFilter.java index af08a7b9c..dab06e05d 100644 --- a/src/com/android/gallery3d/photoeditor/filters/SaturationFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/SaturationFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class SaturationFilter extends AbstractScaleFilter { public static final Creator<SaturationFilter> CREATOR = creatorOf(SaturationFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_SATURATE); effect.setParameter("scale", (scale - 0.5f) * 2); diff --git a/src/com/android/gallery3d/photoeditor/filters/SepiaFilter.java b/src/com/android/gallery3d/photoeditor/filters/SepiaFilter.java index d95c0d84c..efd130b37 100644 --- a/src/com/android/gallery3d/photoeditor/filters/SepiaFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/SepiaFilter.java @@ -16,8 +16,10 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -28,6 +30,7 @@ public class SepiaFilter extends Filter { public static final Creator<SepiaFilter> CREATOR = creatorOf(SepiaFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { getEffect(EffectFactory.EFFECT_SEPIA).apply( src.texture(), src.width(), src.height(), dst.texture()); diff --git a/src/com/android/gallery3d/photoeditor/filters/ShadowFilter.java b/src/com/android/gallery3d/photoeditor/filters/ShadowFilter.java index 03960e405..fd214b3a3 100644 --- a/src/com/android/gallery3d/photoeditor/filters/ShadowFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/ShadowFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class ShadowFilter extends AbstractScaleFilter { public static final Creator<ShadowFilter> CREATOR = creatorOf(ShadowFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_BLACKWHITE); effect.setParameter("black", scale * 0.5f); diff --git a/src/com/android/gallery3d/photoeditor/filters/SharpenFilter.java b/src/com/android/gallery3d/photoeditor/filters/SharpenFilter.java index f066dcf75..90c0ec79b 100644 --- a/src/com/android/gallery3d/photoeditor/filters/SharpenFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/SharpenFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class SharpenFilter extends AbstractScaleFilter { public static final Creator<SharpenFilter> CREATOR = creatorOf(SharpenFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_SHARPEN); effect.setParameter("scale", scale); diff --git a/src/com/android/gallery3d/photoeditor/filters/StraightenFilter.java b/src/com/android/gallery3d/photoeditor/filters/StraightenFilter.java index bf4ace589..f6e3bf08c 100644 --- a/src/com/android/gallery3d/photoeditor/filters/StraightenFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/StraightenFilter.java @@ -16,10 +16,12 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -37,6 +39,7 @@ public class StraightenFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_STRAIGHTEN); effect.setParameter("maxAngle", MAX_DEGREES); diff --git a/src/com/android/gallery3d/photoeditor/filters/TintFilter.java b/src/com/android/gallery3d/photoeditor/filters/TintFilter.java index 7a7463e4c..eb3a831eb 100644 --- a/src/com/android/gallery3d/photoeditor/filters/TintFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/TintFilter.java @@ -16,10 +16,12 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; import android.os.Parcel; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -36,6 +38,7 @@ public class TintFilter extends Filter { } @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_TINT); effect.setParameter("tint", color); diff --git a/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java b/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java index 59034615f..4f6b6526d 100644 --- a/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java @@ -16,9 +16,11 @@ package com.android.gallery3d.photoeditor.filters; +import android.annotation.TargetApi; import android.media.effect.Effect; import android.media.effect.EffectFactory; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.photoeditor.Photo; /** @@ -29,6 +31,7 @@ public class VignetteFilter extends AbstractScaleFilter { public static final Creator<VignetteFilter> CREATOR = creatorOf(VignetteFilter.class); @Override + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public void process(Photo src, Photo dst) { Effect effect = getEffect(EffectFactory.EFFECT_VIGNETTE); effect.setParameter("scale", scale); |