diff options
author | nicolasroard <nicolasroard@google.com> | 2013-10-10 18:37:43 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-10-10 18:50:36 -0700 |
commit | b052e5c72d27c3da585e345d758170c3ab26cbc8 (patch) | |
tree | cee85016946cdd3513eb2595ccb87a7eb39c0743 /src_pd | |
parent | 1ebeed45d206ed306eb149e4e63242b1b55558ef (diff) | |
download | android_packages_apps_Gallery2-b052e5c72d27c3da585e345d758170c3ab26cbc8.tar.gz android_packages_apps_Gallery2-b052e5c72d27c3da585e345d758170c3ab26cbc8.tar.bz2 android_packages_apps_Gallery2-b052e5c72d27c3da585e345d758170c3ab26cbc8.zip |
Use AOSP borders by default
bug:11132358
bug:11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
Diffstat (limited to 'src_pd')
-rw-r--r-- | src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java | 73 |
1 files changed, 1 insertions, 72 deletions
diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java index 66372c27f..cde615e83 100644 --- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -30,7 +30,7 @@ public class FiltersManager extends BaseFiltersManager { private static FiltersManager sInstance = null; private static FiltersManager sPreviewInstance = null; private static FiltersManager sHighresInstance = null; - private static int mImageBorderSize = 4; // in percent + public FiltersManager() { init(); } @@ -49,77 +49,6 @@ public class FiltersManager extends BaseFiltersManager { return sInstance; } - @Override - public void addBorders(Context context) { - - // Do not localize - String[] serializationNames = { - "FRAME_4X5", - "FRAME_BRUSH", - "FRAME_GRUNGE", - "FRAME_SUMI_E", - "FRAME_TAPE", - "FRAME_BLACK", - "FRAME_BLACK_ROUNDED", - "FRAME_WHITE", - "FRAME_WHITE_ROUNDED", - "FRAME_CREAM", - "FRAME_CREAM_ROUNDED" - }; - - // The "no border" implementation - int i = 0; - FilterRepresentation rep = new FilterImageBorderRepresentation(0); - mBorders.add(rep); - - // Regular borders - ArrayList <FilterRepresentation> borderList = new ArrayList<FilterRepresentation>(); - - - rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_4x5); - borderList.add(rep); - - rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_brush); - borderList.add(rep); - - rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_grunge); - borderList.add(rep); - - rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_sumi_e); - borderList.add(rep); - - rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_tape); - borderList.add(rep); - - rep = new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, 0); - borderList.add(rep); - - rep = new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, - mImageBorderSize); - borderList.add(rep); - - rep = new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, 0); - borderList.add(rep); - - rep = new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, - mImageBorderSize); - borderList.add(rep); - - int creamColor = Color.argb(255, 237, 237, 227); - rep = new FilterColorBorderRepresentation(creamColor, mImageBorderSize, 0); - borderList.add(rep); - - rep = new FilterColorBorderRepresentation(creamColor, mImageBorderSize, - mImageBorderSize); - borderList.add(rep); - - for (FilterRepresentation filter : borderList) { - filter.setSerializationName(serializationNames[i++]); - addRepresentation(filter); - } - - } - public static FiltersManager getHighresManager() { if (sHighresInstance == null) { sHighresInstance = new FiltersManager(); |