Merge "Flexiglass: hydrate dozeAmount from transitionValue(AOD)" into main (3ed46f21) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.systemui.deviceentry.shared.model.DeviceUnlockStatus;
		import com.android.systemui.keyguard.MigrateClocksToBlueprint;
		import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor;
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;
		import com.android.systemui.keyguard.shared.model.KeyguardState;
		import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;
		import com.android.systemui.res.R;
		import com.android.systemui.scene.domain.interactor.SceneContainerOcclusionInteractor;
		@@ -223,6 +224,10 @@ public class StatusBarStateControllerImpl implements
		mSceneContainerOcclusionInteractorLazy.get().getInvisibleDueToOcclusion(),
		this::calculateStateFromSceneFramework),
		this::onStatusBarStateChanged);

		mJavaAdapter.alwaysCollectFlow(
		mKeyguardTransitionInteractorLazy.get().transitionValue(KeyguardState.AOD),
		this::onAodKeyguardStateTransitionValueChanged);
		}
		}

		@@ -693,6 +698,14 @@ public class StatusBarStateControllerImpl implements
		updateStateAndNotifyListeners(newState);
		}

		private void onAodKeyguardStateTransitionValueChanged(float value) {
		if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) {
		return;
		}

		setDozeAmountInternal(value);
		}

		private static final Map<SceneKey, Integer> sStatusBarStateByLockedSceneKey = Map.of(
		Scenes.Lockscreen, StatusBarState.KEYGUARD,
		Scenes.Bouncer, StatusBarState.KEYGUARD,