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

Commit 0eb057b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make kotlin 1.3.31 happy with EasterEgg"

parents 021bd427 06c978a4

packages/EasterEgg/src/com/android/egg/paint/BrushPropertyDrawable.kt

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ class BrushPropertyDrawable : Drawable { 
        return _size

    }



    override fun draw(c: Canvas?) {

        c?.let {

    override fun draw(c: Canvas) {

        c.let {

            val w = bounds.width().toFloat()

            val h = bounds.height().toFloat()

            val inset = _size / 12 // 2dp in a 24x24 icon

packages/EasterEgg/src/com/android/egg/paint/Painting.kt

+2 −2
Original line number Diff line number Diff line
@@ -337,11 +337,11 @@ public class Painting : View, SpotFilter.Plotter { 
                            bits.width.toFloat() / oldBits.height,

                            bits.height.toFloat() / oldBits.width)

                }

                c.matrix = matrix

                c.setMatrix(matrix)

            }

            // paint the old artwork atop the new

            c.drawBitmap(oldBits, 0f, 0f, _drawPaint)

            c.matrix = Matrix()

            c.setMatrix(Matrix())

        } else {

            c.drawColor(paperColor)

        }