Merge "Fix compilation issues with new kotlin compiler" am: 4fb04e8b7f

am: 8dc0f634c8

Change-Id: Iaf7fdfa8bdceffdec8512b21eaa4b2a1c4a5bfd7

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

@@ -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()
@@ -90,4 +90,4 @@ class BrushPropertyDrawable : Drawable {
         //
     }
 
-}
+}

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

@@ -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)
         }