Merge "Merge light reveal flag into ambient aod" into main (bbcf1e04) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -397,13 +397,6 @@ flag {
		bug: "301915812"
		}

		flag {
		name: "light_reveal_migration"
		namespace: "systemui"
		description: "Move LightRevealScrim to recommended architecture"
		bug: "281655028"
		}

		flag {
		name: "theme_overlay_controller_wakefulness_deprecation"
		namespace: "systemui"

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback
		import com.android.keyguard.logging.KeyguardLogger
		import com.android.settingslib.Utils
		import com.android.systemui.CoreStartable
		import com.android.systemui.Flags.lightRevealMigration
		import com.android.systemui.biometrics.data.repository.FacePropertyRepository
		import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams
		import com.android.systemui.dagger.SysUISingleton
		@@ -43,6 +42,7 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockSource
		import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.res.R
		import com.android.systemui.shared.Flags.ambientAod
		import com.android.systemui.statusbar.CircleReveal
		import com.android.systemui.statusbar.LiftReveal
		import com.android.systemui.statusbar.LightRevealEffect
		@@ -196,7 +196,7 @@ constructor(

		// This code path is not used if the KeyguardTransitionRepository is managing the light
		// reveal scrim.
		if (!lightRevealMigration()) {
		if (!ambientAod()) {
		if (statusBarStateController.isDozing \|\| biometricUnlockController.isWakeAndUnlock) {
		circleReveal?.let {
		lightRevealScrim.revealAmount = 0f
		@@ -213,7 +213,7 @@ constructor(
		}

		override fun onKeyguardFadingAwayChanged() {
		if (lightRevealMigration()) {
		if (ambientAod()) {
		return
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ package com.android.systemui.keyguard
		import android.content.Context
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.systemui.CoreStartable
		import com.android.systemui.Flags.lightRevealMigration
		import com.android.systemui.biometrics.ui.binder.DeviceEntryUnlockTrackerViewBinder
		import com.android.systemui.common.ui.ConfigurationState
		import com.android.systemui.dagger.SysUISingleton
		@@ -46,6 +45,7 @@ import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.shade.ShadeDisplayAware
		import com.android.systemui.shade.domain.interactor.ShadeInteractor
		import com.android.systemui.shared.Flags.ambientAod
		import com.android.systemui.statusbar.KeyguardIndicationController
		import com.android.systemui.statusbar.LightRevealScrim
		import com.android.systemui.statusbar.VibratorHelper
		@@ -105,7 +105,7 @@ constructor(
		bindJankViewModel()
		initializeViews()

		if (lightRevealMigration()) {
		if (ambientAod()) {
		LightRevealScrimViewBinder.bind(
		lightRevealScrim,
		lightRevealScrimViewModel,

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.keyguard.ui.viewmodel

		import android.util.MathUtils
		import com.android.systemui.Flags.lightRevealMigration
		import com.android.systemui.communal.ui.compose.TransitionDuration
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.dagger.GlanceableHubBlurComponent
		@@ -28,6 +27,7 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import com.android.systemui.keyguard.ui.transitions.GlanceableHubTransition
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.shared.Flags.ambientAod
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.flow.Flow
		@@ -56,14 +56,14 @@ constructor(
		return transitionAnimation.sharedFlow(
		duration = 250.milliseconds,
		startTime =
		if (lightRevealMigration()) {
		if (ambientAod()) {
		100.milliseconds // Wait for the light reveal to "hit" the LS elements.
		} else {
		0.milliseconds
		},
		onStart = {
		currentAlpha =
		if (lightRevealMigration()) {
		if (ambientAod()) {
		viewState.alpha()
		} else {
		0f

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.keyguard.ui.viewmodel

		import android.util.MathUtils
		import com.android.systemui.Flags.lightRevealMigration
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.domain.interactor.FromAodTransitionInteractor
		import com.android.systemui.keyguard.shared.model.Edge
		@@ -25,6 +24,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.AOD
		import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition
		import com.android.systemui.shared.Flags.ambientAod
		import javax.inject.Inject
		import kotlin.time.Duration.Companion.milliseconds
		import kotlinx.coroutines.flow.Flow
		@@ -52,13 +52,13 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow) : DeviceEntryIconTra
		return transitionAnimation.sharedFlow(
		duration = 250.milliseconds,
		startTime =
		if (lightRevealMigration()) {
		if (ambientAod()) {
		100.milliseconds // Wait for the light reveal to "hit" the LS elements.
		} else {
		0.milliseconds
		},
		onStart = {
		if (lightRevealMigration()) {
		if (ambientAod()) {
		currentAlpha = viewState.alpha()
		} else {
		currentAlpha = 0f