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

Commit b052e5c7 authored by nicolasroard's avatar nicolasroard
Browse files

Use AOSP borders by default 

bug:11132358
bug:11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
parent 1ebeed45

src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java

+69 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.gallery3d.filtershow.filters; 


import android.content.Context;

import android.content.res.Resources;

import android.graphics.Color;

import android.util.Log;



import com.android.gallery3d.R;
@@ -35,6 +36,7 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { 
    protected ArrayList<FilterRepresentation> mBorders = new ArrayList<FilterRepresentation>();

    protected ArrayList<FilterRepresentation> mTools = new ArrayList<FilterRepresentation>();

    protected ArrayList<FilterRepresentation> mEffects = new ArrayList<FilterRepresentation>();

    private static int mImageBorderSize = 4; // in percent



    protected void init() {

        mFilters = new HashMap<Class, ImageFilter>();
@@ -158,6 +160,73 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { 


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

            mBorders.add(filter);

        }



    }



    public void addLooks(Context context) {

src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java

+1 −72
Original line number Diff line number Diff line
@@ -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();