diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 20:57:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 20:57:50 -0800 |
| commit | e3d06c85a047bc37c2ef3bb599da07ec036a2a5d (patch) | |
| tree | e09af38348e723f07b859459f383836d42dc2cc6 | |
| parent | 6faf2bb61a436e9581a6f67d1141a603fb195a62 (diff) | |
| parent | 3507b925ce1edb2563c076d2d9f01bfadf9f61e5 (diff) | |
| download | android_packages_apps_Gallery2-e3d06c85a047bc37c2ef3bb599da07ec036a2a5d.tar.gz android_packages_apps_Gallery2-e3d06c85a047bc37c2ef3bb599da07ec036a2a5d.tar.bz2 android_packages_apps_Gallery2-e3d06c85a047bc37c2ef3bb599da07ec036a2a5d.zip | |
am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
| -rw-r--r-- | res/drawable/filtershow_border_grunge.9.png | bin | 0 -> 86589 bytes | |||
| -rw-r--r-- | res/drawable/filtershow_border_sumi_e.9.png | bin | 0 -> 45106 bytes | |||
| -rw-r--r-- | res/drawable/filtershow_border_tape.9.png | bin | 0 -> 216055 bytes | |||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 12 |
4 files changed, 11 insertions, 1 deletions
diff --git a/res/drawable/filtershow_border_grunge.9.png b/res/drawable/filtershow_border_grunge.9.png Binary files differnew file mode 100644 index 000000000..fa2d4747d --- /dev/null +++ b/res/drawable/filtershow_border_grunge.9.png diff --git a/res/drawable/filtershow_border_sumi_e.9.png b/res/drawable/filtershow_border_sumi_e.9.png Binary files differnew file mode 100644 index 000000000..45f109412 --- /dev/null +++ b/res/drawable/filtershow_border_sumi_e.9.png diff --git a/res/drawable/filtershow_border_tape.9.png b/res/drawable/filtershow_border_tape.9.png Binary files differnew file mode 100644 index 000000000..3837c5dc0 --- /dev/null +++ b/res/drawable/filtershow_border_tape.9.png diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 2b37c57be..b88780b26 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -717,19 +717,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++) { |
