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

Commit 4fb04e8b authored by Haibo Huang's avatar Haibo Huang Committed by Gerrit Code Review
Browse files

Merge "Fix compilation issues with new kotlin compiler"

parents c5199685 11ab9505

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

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

        return _size

    }

    }





    override fun draw(c: Canvas?) {

    override fun draw(c: Canvas) {

        c?.let {

        c?.let {

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

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

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

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

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

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

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

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

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

                }

                }

                c.matrix = matrix

                c.setMatrix(matrix)

            }

            }

            // paint the old artwork atop the new

            // paint the old artwork atop the new

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

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

            c.matrix = Matrix()

            c.setMatrix(Matrix())

        } else {

        } else {

            c.drawColor(paperColor)

            c.drawColor(paperColor)

        }

        }