diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-11 20:17:44 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-10-11 20:31:59 -0700 |
| commit | 8e1536da92f155731d5fd729ec5b2bf00709091a (patch) | |
| tree | f8aafbce0b99488844662861bbb8a694ecb81318 /src | |
| parent | e533f65961ed601ded1803caeab6cef0a778d2f2 (diff) | |
| download | android_packages_apps_Gallery2-8e1536da92f155731d5fd729ec5b2bf00709091a.tar.gz android_packages_apps_Gallery2-8e1536da92f155731d5fd729ec5b2bf00709091a.tar.bz2 android_packages_apps_Gallery2-8e1536da92f155731d5fd729ec5b2bf00709091a.zip | |
Add new borders
bug:7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
Diffstat (limited to 'src')
| -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 |