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

Commit 43dab7fd authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3701 into donut 

* changes:
  Fix the way gestures are rasterized to bitmaps.
parents 084af5e1 cfbe8cf8

core/java/android/gesture/Gesture.java

+19 −10
Original line number Diff line number Diff line
@@ -216,16 +216,15 @@ public class Gesture implements Parcelable { 
     * 

     * @param width

     * @param height

     * @param edge

     * @param inset

     * @param color

     * @return the bitmap

     */

    public Bitmap toBitmap(int width, int height, int edge, int color) {

        final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);

    public Bitmap toBitmap(int width, int height, int inset, int color) {

        final Bitmap bitmap = Bitmap.createBitmap(width, height,

                Bitmap.Config.ARGB_8888);

        final Canvas canvas = new Canvas(bitmap);



        canvas.translate(edge, edge);



        final Paint paint = new Paint();

        paint.setAntiAlias(BITMAP_RENDERING_ANTIALIAS);

        paint.setDither(BITMAP_RENDERING_DITHER);
@@ -235,12 +234,22 @@ public class Gesture implements Parcelable { 
        paint.setStrokeCap(Paint.Cap.ROUND);

        paint.setStrokeWidth(BITMAP_RENDERING_WIDTH);



        final ArrayList<GestureStroke> strokes = mStrokes;

        final int count = strokes.size();

        final Path path = toPath();

        final RectF bounds = new RectF();

        path.computeBounds(bounds, true);



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

            strokes.get(i).draw(canvas, paint);

        }

        final float sx = (width - 2 * inset) / bounds.width();

        final float sy = (height - 2 * inset) / bounds.height();

        final float scale = sx > sy ? sy : sx;

        paint.setStrokeWidth(2.0f / scale);



        path.offset(-bounds.left + (width - bounds.width() * scale) / 2.0f,

                -bounds.top + (height - bounds.height() * scale) / 2.0f);



        canvas.translate(inset, inset);

        canvas.scale(scale, scale);



        canvas.drawPath(path, paint);



        return bitmap;

    }

core/java/android/gesture/GestureOverlayView.java

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ public class GestureOverlayView extends FrameLayout { 
        final RectF bounds = new RectF();

        path.computeBounds(bounds, true);



        // TODO: The path should also be scaled to fit inside this view

        mPath.rewind();

        mPath.addPath(path, -bounds.left + (getWidth() - bounds.width()) / 2.0f,

                -bounds.top + (getHeight() - bounds.height()) / 2.0f);