Add new borders

bug:7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a

diff --git a/res/drawable/filtershow_border_4x5.9.png b/res/drawable/filtershow_border_4x5.9.png
new file mode 100644 (file)
index 0000000..4cddf15
Binary files /dev/null and b/res/drawable/filtershow_border_4x5.9.png differ

diff --git a/res/drawable/filtershow_border_brush.9.png b/res/drawable/filtershow_border_brush.9.png
new file mode 100644 (file)
index 0000000..db51d24
Binary files /dev/null and b/res/drawable/filtershow_border_brush.9.png differ

diff --git a/res/drawable/filtershow_border_film3.9.png b/res/drawable/filtershow_border_film3.9.png
deleted file mode 100644 (file)
index 8ce70cb..0000000
Binary files a/res/drawable/filtershow_border_film3.9.png and /dev/null differ

diff --git a/res/drawable/filtershow_border_scratch3.9.png b/res/drawable/filtershow_border_scratch3.9.png
deleted file mode 100644 (file)
index 7552785..0000000
Binary files a/res/drawable/filtershow_border_scratch3.9.png and /dev/null differ

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 0dfaf08..5553a3c 100644 (file)
--- 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 ce7bcf7..3649d28 100644 (file)
--- 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