summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/EasterEgg/src/com/android/egg/paint/BrushPropertyDrawable.kt4
-rw-r--r--packages/EasterEgg/src/com/android/egg/paint/Painting.kt4
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/EasterEgg/src/com/android/egg/paint/BrushPropertyDrawable.kt b/packages/EasterEgg/src/com/android/egg/paint/BrushPropertyDrawable.kt
index 4a02ee688cf4..d06e5ec634de 100644
--- a/packages/EasterEgg/src/com/android/egg/paint/BrushPropertyDrawable.kt
+++ b/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 {
//
}
-} \ No newline at end of file
+}
diff --git a/packages/EasterEgg/src/com/android/egg/paint/Painting.kt b/packages/EasterEgg/src/com/android/egg/paint/Painting.kt
index a4a3d3d835e0..5431ae539ba1 100644
--- a/packages/EasterEgg/src/com/android/egg/paint/Painting.kt
+++ b/packages/EasterEgg/src/com/android/egg/paint/Painting.kt
@@ -333,11 +333,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)
}