Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3507b925 authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Add new borders assets" into gb-ub-photos-arches

parents cd84d676 48b29c82

res/drawable/filtershow_border_grunge.9.png

0 → 100644
+84.6 KiB
Loading image diff...

res/drawable/filtershow_border_sumi_e.9.png

0 → 100644
+44 KiB
Loading image diff...

res/drawable/filtershow_border_tape.9.png

0 → 100644
+211 KiB
Loading image diff...

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -710,19 +710,29 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
        // TODO: use listview

        // TODO: load the borders straight from the filesystem

        int p = 0;

        ImageFilter[] borders = new ImageFilter[7];

        ImageFilter[] borders = new ImageFilter[12];

        borders[p++] = new ImageFilterBorder(null);



        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);

        Drawable npd3 = getResources().getDrawable(R.drawable.filtershow_border_grunge);

        borders[p++] = new ImageFilterBorder(npd3);

        Drawable npd4 = getResources().getDrawable(R.drawable.filtershow_border_sumi_e);

        borders[p++] = new ImageFilterBorder(npd4);

        Drawable npd5 = getResources().getDrawable(R.drawable.filtershow_border_tape);

        borders[p++] = new ImageFilterBorder(npd5);

        borders[p++] = new ImageFilterParametricBorder(Color.BLACK, mImageBorderSize, 0);

        borders[p++] = new ImageFilterParametricBorder(Color.BLACK, mImageBorderSize,

                mImageBorderSize);

        borders[p++] = new ImageFilterParametricBorder(Color.WHITE, mImageBorderSize, 0);

        borders[p++] = new ImageFilterParametricBorder(Color.WHITE, mImageBorderSize,

                mImageBorderSize);

        int creamColor = Color.argb(255, 237, 237, 227);

        borders[p++] = new ImageFilterParametricBorder(creamColor, mImageBorderSize, 0);

        borders[p++] = new ImageFilterParametricBorder(creamColor, mImageBorderSize,

                mImageBorderSize);



        ImageSmallFilter previousFilter = null;

        for (int i = 0; i < p; i++) {