From b052e5c72d27c3da585e345d758170c3ab26cbc8 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Thu, 10 Oct 2013 18:37:43 -0700
Subject: Use AOSP borders by default

bug:11132358
bug:11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
---
 .../filtershow/filters/FiltersManager.java         | 73 +---------------------
 1 file changed, 1 insertion(+), 72 deletions(-)

(limited to 'src_pd')

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();
-- 
cgit v1.2.3