Merge "Remove AoD icons from burn in layer" into main (924b60cb) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ object KeyguardRootViewBinder {
		.collect { y ->
		childViews[burnInLayerId]?.translationY = y
		childViews[largeClockId]?.translationY = y
		childViews[aodNotificationIconContainerId]?.translationY = y
		}
		}

		@@ -200,6 +201,7 @@ object KeyguardRootViewBinder {
		.collect { x ->
		childViews[burnInLayerId]?.translationX = x
		childViews[largeClockId]?.translationX = x
		childViews[aodNotificationIconContainerId]?.translationX = x
		}
		}

		@@ -219,6 +221,10 @@ object KeyguardRootViewBinder {
		// transition with other parts in burnInLayer
		childViews[burnInLayerId]?.scaleX = scaleViewModel.scale
		childViews[burnInLayerId]?.scaleY = scaleViewModel.scale
		childViews[aodNotificationIconContainerId]?.scaleX =
		scaleViewModel.scale
		childViews[aodNotificationIconContainerId]?.scaleY =
		scaleViewModel.scale
		}
		}
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -41,11 +41,13 @@ constructor(
		return
		}

		val nic = constraintLayout.requireViewById<View>(R.id.aod_notification_icon_container)
		// The burn-in layer requires at least 1 view at all times
		val emptyView = View(context, null).apply { id = View.generateViewId() }
		constraintLayout.addView(emptyView)
		burnInLayer =
		AodBurnInLayer(context).apply {
		id = R.id.burn_in_layer
		addView(nic)
		addView(emptyView)
		if (!migrateClocksToBlueprint()) {
		val statusView =
		constraintLayout.requireViewById<View>(R.id.keyguard_status_view)