diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-11 21:02:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 21:02:17 -0700 |
| commit | ba1624a581085a79da133fb18ce1296546c21511 (patch) | |
| tree | 1ca5c1e632b866e9b3566ee8a14063885276da62 | |
| parent | 1c0da82e36f25dad052e9af8d4058d6ff417cc60 (diff) | |
| parent | 968fbe04d088de427646e3ea3ca53026ff8b3514 (diff) | |
| download | android_packages_apps_Snap-ba1624a581085a79da133fb18ce1296546c21511.tar.gz android_packages_apps_Snap-ba1624a581085a79da133fb18ce1296546c21511.tar.bz2 android_packages_apps_Snap-ba1624a581085a79da133fb18ce1296546c21511.zip | |
am 8e1536da: Add new borders
* commit '8e1536da92f155731d5fd729ec5b2bf00709091a':
Add new borders
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 9 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java | 1 |
2 files changed, 5 insertions, 5 deletions
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 |