Merge "Match SFPS Keyguard color to the bouncer secondary color" into tm-qpr-dev (106aa99d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt

+8 −4

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ constructor(
		scope.launch {
		alternateBouncerInteractor.isVisible.collect { isVisible: Boolean ->
		if (isVisible) {
		show(SideFpsUiRequestSource.ALTERNATE_BOUNCER)
		show(SideFpsUiRequestSource.ALTERNATE_BOUNCER, REASON_AUTH_KEYGUARD)
		} else {
		hide(SideFpsUiRequestSource.ALTERNATE_BOUNCER)
		}
		@@ -436,13 +436,17 @@ private fun LottieAnimationView.addOverlayDynamicColor(
		@BiometricOverlayConstants.ShowReason reason: Int
		) {
		fun update() {
		val c = context.getColor(R.color.biometric_dialog_accent)
		val chevronFill = context.getColor(R.color.sfps_chevron_fill)
		val isKeyguard = reason == REASON_AUTH_KEYGUARD
		if (isKeyguard) {
		val color = context.getColor(R.color.numpad_key_color_secondary) // match bouncer color
		val chevronFill =
		com.android.settingslib.Utils.getColorAttrDefaultColor(
		context,
		android.R.attr.textColorPrimaryInverse
		)
		for (key in listOf(".blue600", ".blue400")) {
		addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) {
		PorterDuffColorFilter(c, PorterDuff.Mode.SRC_ATOP)
		PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
		}
		}
		addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) {