From 968fbe04d088de427646e3ea3ca53026ff8b3514 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Thu, 11 Oct 2012 20:17:44 -0700 Subject: Add new borders bug:7233749 Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a --- src/com/android/gallery3d/filtershow/FilterShowActivity.java | 9 ++++----- .../filtershow/filters/ImageFilterParametricBorder.java | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 0dfaf082b..5553a3c20 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -474,11 +474,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, ImageFilter[] borders = new ImageFilter[7]; borders[p++] = new ImageFilterBorder(null); - Drawable npd3 = getResources().getDrawable(R.drawable.filtershow_border_film3); - borders[p++] = new ImageFilterBorder(npd3); - Drawable npd = getResources().getDrawable( - R.drawable.filtershow_border_scratch3); - borders[p++] = new ImageFilterBorder(npd); + Drawable npd1 = getResources().getDrawable(R.drawable.filtershow_border_4x5); + borders[p++] = new ImageFilterBorder(npd1); + Drawable npd2 = getResources().getDrawable(R.drawable.filtershow_border_brush); + borders[p++] = new ImageFilterBorder(npd2); borders[p++] = new ImageFilterParametricBorder(Color.BLACK, 100, 0); borders[p++] = new ImageFilterParametricBorder(Color.BLACK, 100, 100); borders[p++] = new ImageFilterParametricBorder(Color.WHITE, 100, 0); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java index ce7bcf74c..3649d28fa 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java @@ -20,6 +20,7 @@ public class ImageFilterParametricBorder extends ImageFilter { public ImageFilterParametricBorder(int color, int size, int radius) { setBorder(color, size, radius); + setFilterType(TYPE_BORDER); } @Override -- cgit v1.2.3