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

Commit 9b57886d authored by John Hoford's avatar John Hoford Committed by Android Git Automerger
Browse files

am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad 

* commit 'c3606508':
  add circle brush
parents d1b3e27b c3606508

res/drawable-nodpi/brush_gauss.png

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

src/com/android/gallery3d/filtershow/editors/EditorDraw.java

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public class EditorDraw extends ParametricEditor implements FilterView { 
    private static final int MODE_STYLE = FilterDrawRepresentation.PARAM_STYLE;

    int[] brushIcons = {

            R.drawable.brush_flat,

            R.drawable.brush_gauss,

            R.drawable.brush_marker,

            R.drawable.brush_spatter

    };

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

+10 −8
Original line number Diff line number Diff line
@@ -51,9 +51,16 @@ public class FilterDrawRepresentation extends FilterRepresentation { 
    private BasicParameterInt mParamBrightness = new ParameterBrightness(PARAM_BRIGHTNESS, 220);

    private BasicParameterInt mParamSaturation = new ParameterSaturation(PARAM_SATURATION, 200);

    private ParameterOpacity mParamOpacity = new ParameterOpacity(PARAM_OPACITY, 200);

    private BasicParameterStyle mParamStyle = new BasicParameterStyle(PARAM_STYLE, 3);

    private BasicParameterStyle mParamStyle = new BasicParameterStyle(PARAM_STYLE, 4);

    int mParamMode;

    Parameter mCurrentParam = mParamSize;

    private static final String SERIAL_COLOR = "color";

    private static final String SERIAL_RADIUS = "radius";

    private static final String SERIAL_TYPE = "type";

    private static final String SERIAL_POINTS_COUNT = "point_count";

    private static final String SERIAL_POINTS = "points";

    private static final String SERIAL_PATH =  "path";





    private Parameter[] mAllParam = {

            mParamSize,
@@ -256,11 +263,6 @@ public class FilterDrawRepresentation extends FilterRepresentation { 
        mCurrent = null;

        mDrawing.clear();

    }

    private static final String SERIAL_COLOR = "color";

    private static final String SERIAL_RADIUS = "radius";

    private static final String SERIAL_TYPE = "type";

    private static final String SERIAL_POINTS_COUNT = "point_count";

    private static final String SERIAL_POINTS = "points";



    @Override

    public void serializeRepresentation(JsonWriter writer) throws IOException {
@@ -272,7 +274,7 @@ public class FilterDrawRepresentation extends FilterRepresentation { 


        PathMeasure mPathMeasure = new PathMeasure();

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

            writer.name("path" + i);

            writer.name(SERIAL_PATH + i);

            writer.beginObject();

            StrokeData mark = mDrawing.get(i);

            writer.name(SERIAL_COLOR).value(mark.mColor);

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

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public class ImageFilterDraw extends ImageFilter { 


    DrawStyle[] mDrawingsTypes = new DrawStyle[] {

            new SimpleDraw(),

            new Brush(R.drawable.brush_gauss),

            new Brush(R.drawable.brush_marker),

            new Brush(R.drawable.brush_spatter)

    };