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

Commit 38fa9eee authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that. 

Merge commit '89d538dc' into eclair-plus-aosp

* commit '89d538dc':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
parents 895c92a4 89d538dc

tools/layoutlib/bridge/src/android/graphics/Canvas.java

+32 −28
Original line number Diff line number Diff line
@@ -784,6 +784,7 @@ public class Canvas extends _Original_Canvas { 


    private final void doDrawRect(int left, int top, int width, int height, Paint paint) {

        // get current graphisc

        if (width != 0 && height != 0) {

            Graphics2D g = getGraphics2d();



            g = getNewGraphics(paint, g);
@@ -802,6 +803,7 @@ public class Canvas extends _Original_Canvas { 
            // dispose Graphics2D object

            g.dispose();

        }

    }



    /* (non-Javadoc)

     * @see android.graphics.Canvas#drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint)
@@ -809,6 +811,7 @@ public class Canvas extends _Original_Canvas { 
    @Override

    public void drawRoundRect(RectF rect, float rx, float ry, Paint paint) {

        // get current graphisc

        if (rect.width() != 0 && rect.height() != 0) {

            Graphics2D g = getGraphics2d();



            g = getNewGraphics(paint, g);
@@ -833,6 +836,7 @@ public class Canvas extends _Original_Canvas { 
            // dispose Graphics2D object

            g.dispose();

        }

    }





    /* (non-Javadoc)