Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix compilation issues with new kotlin compiler"

Browse Source
This commit is contained in:
Haibo Huang
2019-05-29 22:21:00 +00:00
committed by Gerrit Code Review
parent c51996859d 11ab950560
commit 4fb04e8b7f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/EasterEgg/src/com/android/egg/paint/BrushPropertyDrawable.kt
View File

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

4
packages/EasterEgg/src/com/android/egg/paint/Painting.kt
View File

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