Merge "Add logging to KeyguardViewMediator dream transition" into main (79ad6863) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
		import com.android.systemui.communal.domain.interactor.CommunalInteractor
		import com.android.systemui.communal.shared.model.CommunalScenes
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.ui.viewmodel.DreamingToGlanceableHubTransitionViewModel
		@@ -28,6 +29,7 @@ import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransition
		import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToDreamingTransitionViewModel
		import com.android.systemui.res.R
		import com.android.systemui.settings.UserTracker
		import com.android.systemui.util.kotlin.FlowDumperImpl
		import javax.inject.Inject
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow
		@@ -49,7 +51,8 @@ constructor(
		private val communalInteractor: CommunalInteractor,
		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
		private val userTracker: UserTracker,
		) {
		dumpManager: DumpManager,
		) : FlowDumperImpl(dumpManager) {

		fun startTransitionFromDream() {
		val showGlanceableHub =
		@@ -83,6 +86,7 @@ constructor(
		toGlanceableHubTransitionViewModel.dreamAlpha,
		)
		.distinctUntilChanged()
		.dumpWhileCollecting("dreamAlpha")

		val dreamOverlayAlpha: Flow<Float> =
		merge(

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -1307,7 +1307,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,

		private Consumer<Float> getRemoteSurfaceAlphaApplier() {
		return (Float alpha) -> {
		if (mRemoteAnimationTarget == null) return;
		if (mRemoteAnimationTarget == null) {
		Log.e(TAG, "Attempting to set alpha on null animation target");
		return;
		}
		final View localView = mKeyguardViewControllerLazy.get().getViewRootImpl().getView();
		final SyncRtSurfaceTransactionApplier applier =
		new SyncRtSurfaceTransactionApplier(localView);
		@@ -1635,6 +1638,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		collectFlow(viewRootImpl.getView(),
		communalViewModel.getTransitionFromOccludedEnded(),
		getFinishedCallbackConsumer(), mMainDispatcher);
		} else {
		Log.e(TAG, "Keyguard ViewRootImpl is null");
		}
		}
		// Most services aren't available until the system reaches the ready state, so we