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

Commit 06a77e33 authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

Merge "Fix compilation issues with new kotlin compiler" am: 4fb04e8b am: 8dc0f634 

am: 4cdd1e71

Change-Id: Ibeeab5d2f7277bac3d9b1edbe9fdaf7704fd7d3e
parents ad7a8954 4cdd1e71

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

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

    }



    override fun draw(c: Canvas?) {

    override fun draw(c: Canvas) {

        c?.let {

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

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

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)

        }