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

Merge "Remove duplicated path scaling of camera protection and scanning rim." into tm-qpr-dev

Browse Source
This commit is contained in:
Chandru S
2022-10-23 13:17:34 +00:00
committed by Android (Google) Code Review
parent 8c0ea7ee86 1dd959d68f
commit ec30c5a903
1 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt
View File

@@ -55,7 +55,7 @@ class FaceScanningOverlay(
private val rimRect = RectF() private val rimRect = RectF()
private var cameraProtectionColor = Color.BLACK private var cameraProtectionColor = Color.BLACK
var faceScanningAnimColor = Utils.getColorAttrDefaultColor(context, var faceScanningAnimColor = Utils.getColorAttrDefaultColor(context,
com.android.systemui.R.attr.wallpaperTextColorAccent) R.attr.wallpaperTextColorAccent)
private var cameraProtectionAnimator: ValueAnimator? = null private var cameraProtectionAnimator: ValueAnimator? = null
var hideOverlayRunnable: Runnable? = null var hideOverlayRunnable: Runnable? = null
var faceAuthSucceeded = false var faceAuthSucceeded = false
@@ -84,39 +84,38 @@ class FaceScanningOverlay(
} }
override fun drawCutoutProtection(canvas: Canvas) { override fun drawCutoutProtection(canvas: Canvas) {
if (rimProgress > HIDDEN_RIM_SCALE && !protectionRect.isEmpty) { if (protectionRect.isEmpty) {
val rimPath = Path(protectionPath) return
val scaleMatrix = Matrix().apply {
val rimBounds = RectF()
rimPath.computeBounds(rimBounds, true)
setScale(rimProgress, rimProgress, rimBounds.centerX(), rimBounds.centerY())
} }
rimPath.transform(scaleMatrix) if (rimProgress > HIDDEN_RIM_SCALE) {
drawFaceScanningRim(canvas)
}
if (cameraProtectionProgress > HIDDEN_CAMERA_PROTECTION_SCALE) {
drawCameraProtection(canvas)
}
}
private fun drawFaceScanningRim(canvas: Canvas) {
val rimPath = Path(protectionPath)
scalePath(rimPath, rimProgress)
rimPaint.style = Paint.Style.FILL rimPaint.style = Paint.Style.FILL
val rimPaintAlpha = rimPaint.alpha val rimPaintAlpha = rimPaint.alpha
rimPaint.color = ColorUtils.blendARGB( rimPaint.color = ColorUtils.blendARGB(
faceScanningAnimColor, faceScanningAnimColor,
Color.WHITE, Color.WHITE,
statusBarStateController.dozeAmount) statusBarStateController.dozeAmount
)
rimPaint.alpha = rimPaintAlpha rimPaint.alpha = rimPaintAlpha
canvas.drawPath(rimPath, rimPaint) canvas.drawPath(rimPath, rimPaint)
} }
if (cameraProtectionProgress > HIDDEN_CAMERA_PROTECTION_SCALE && private fun drawCameraProtection(canvas: Canvas) {
!protectionRect.isEmpty) {
val scaledProtectionPath = Path(protectionPath) val scaledProtectionPath = Path(protectionPath)
val scaleMatrix = Matrix().apply { scalePath(scaledProtectionPath, cameraProtectionProgress)
val protectionPathRect = RectF()
scaledProtectionPath.computeBounds(protectionPathRect, true)
setScale(cameraProtectionProgress, cameraProtectionProgress,
protectionPathRect.centerX(), protectionPathRect.centerY())
}
scaledProtectionPath.transform(scaleMatrix)
paint.style = Paint.Style.FILL paint.style = Paint.Style.FILL
paint.color = cameraProtectionColor paint.color = cameraProtectionColor
canvas.drawPath(scaledProtectionPath, paint) canvas.drawPath(scaledProtectionPath, paint)
} }
}
override fun updateVisOnUpdateCutout(): Boolean { override fun updateVisOnUpdateCutout(): Boolean {
return false // instead, we always update the visibility whenever face scanning starts/ends return false // instead, we always update the visibility whenever face scanning starts/ends
@@ -371,5 +370,17 @@ class FaceScanningOverlay(
private const val PULSE_ERROR_DISAPPEAR_DURATION = 200L private const val PULSE_ERROR_DISAPPEAR_DURATION = 200L
private const val CAMERA_PROTECTION_ERROR_DISAPPEAR_DURATION = 300L // without start delay private const val CAMERA_PROTECTION_ERROR_DISAPPEAR_DURATION = 300L // without start delay
private fun scalePath(path: Path, scalingFactor: Float) {
val scaleMatrix = Matrix().apply {
val boundingRectangle = RectF()
path.computeBounds(boundingRectangle, true)
setScale(
scalingFactor, scalingFactor,
boundingRectangle.centerX(), boundingRectangle.centerY()
)
}
path.transform(scaleMatrix)
}
} }
} }