Revert "Support transitioning from doze to dream from button press." (1c6fa730) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DozingToDreamingTransitionViewModelTest.kt

deleted100644 → 0

+0 −54

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2025 The Android Open Source Project
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	package com.android.systemui.keyguard.ui.viewmodel

	import androidx.test.ext.junit.runners.AndroidJUnit4
	import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase
	import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
	import com.android.systemui.keyguard.shared.model.KeyguardState
	import com.android.systemui.kosmos.collectValues
	import com.android.systemui.kosmos.runTest
	import com.android.systemui.kosmos.testScope
	import com.android.systemui.testKosmos
	import com.google.common.truth.Truth.assertThat
	import org.junit.Test
	import org.junit.runner.RunWith

	@SmallTest
	@RunWith(AndroidJUnit4::class)
	class DozingToDreamingTransitionViewModelTest : SysuiTestCase() {
	val kosmos = testKosmos()

	val underTest by lazy { kosmos.dozingToDreamingTransitionViewModel }

	@Test
	fun notificationShadeAlpha() =
	kosmos.runTest {
	val values by collectValues(underTest.notificationAlpha)
	assertThat(values).isEmpty()

	fakeKeyguardTransitionRepository.sendTransitionSteps(
	from = KeyguardState.DOZING,
	to = KeyguardState.DREAMING,
	testScope,
	)

	assertThat(values).isNotEmpty()
	values.forEach { assertThat(it).isEqualTo(0) }
	}
	}

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -161,7 +161,6 @@ constructor(
	val isKeyguardOccludedLegacy = keyguardInteractor.isKeyguardOccluded.value		val isKeyguardOccludedLegacy = keyguardInteractor.isKeyguardOccluded.value
	val primaryBouncerShowing = keyguardInteractor.primaryBouncerShowing.value		val primaryBouncerShowing = keyguardInteractor.primaryBouncerShowing.value
	val isKeyguardGoingAway = keyguardInteractor.isKeyguardGoingAway.value		val isKeyguardGoingAway = keyguardInteractor.isKeyguardGoingAway.value
	val canStartDreaming = dreamManager.canStartDreaming(false)

	if (!deviceEntryInteractor.isLockscreenEnabled()) {		if (!deviceEntryInteractor.isLockscreenEnabled()) {
	if (!SceneContainerFlag.isEnabled) {		if (!SceneContainerFlag.isEnabled) {
	@@ -198,13 +197,6 @@ constructor(
	if (!SceneContainerFlag.isEnabled) {		if (!SceneContainerFlag.isEnabled) {
	transitionToGlanceableHub()		transitionToGlanceableHub()
	}		}
	} else if (canStartDreaming) {
	// If we're waking up to dream, transition directly to dreaming without
	// showing the lockscreen.
	startTransitionTo(
	KeyguardState.DREAMING,
	ownerReason = "moving from doze to dream",
	)
	} else {		} else {
	startTransitionTo(KeyguardState.LOCKSCREEN)		startTransitionTo(KeyguardState.LOCKSCREEN)
	}		}

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DozingToDreamingTransitionViewModel.kt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,4 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow) {
	)		)

	val lockscreenAlpha: Flow<Float> = transitionAnimation.immediatelyTransitionTo(0f)		val lockscreenAlpha: Flow<Float> = transitionAnimation.immediatelyTransitionTo(0f)
	// Notifications should not be shown while transitioning to dream.
	val notificationAlpha = transitionAnimation.immediatelyTransitionTo(0f)
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt

+0 −3

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelKosmos.kt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,6 @@ import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.AodToOccludedTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.AodToOccludedTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.DozingToDreamingTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.DozingToGlanceableHubTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.DozingToGlanceableHubTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.DozingToOccludedTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.DozingToOccludedTransitionViewModel
	@@ -137,7 +136,6 @@ constructor(
	private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,		private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,
	private val aodToOccludedTransitionViewModel: AodToOccludedTransitionViewModel,		private val aodToOccludedTransitionViewModel: AodToOccludedTransitionViewModel,
	private val aodToPrimaryBouncerTransitionViewModel: AodToPrimaryBouncerTransitionViewModel,		private val aodToPrimaryBouncerTransitionViewModel: AodToPrimaryBouncerTransitionViewModel,
	private val dozingToDreamingTransitionViewModel: DozingToDreamingTransitionViewModel,
	dozingToGlanceableHubTransitionViewModel: DozingToGlanceableHubTransitionViewModel,		dozingToGlanceableHubTransitionViewModel: DozingToGlanceableHubTransitionViewModel,
	private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel,		private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel,
	private val dozingToOccludedTransitionViewModel: DozingToOccludedTransitionViewModel,		private val dozingToOccludedTransitionViewModel: DozingToOccludedTransitionViewModel,
	@@ -574,7 +572,6 @@ constructor(
	aodToLockscreenTransitionViewModel.notificationAlpha,		aodToLockscreenTransitionViewModel.notificationAlpha,
	aodToOccludedTransitionViewModel.lockscreenAlpha(viewState),		aodToOccludedTransitionViewModel.lockscreenAlpha(viewState),
	aodToPrimaryBouncerTransitionViewModel.notificationAlpha,		aodToPrimaryBouncerTransitionViewModel.notificationAlpha,
	dozingToDreamingTransitionViewModel.notificationAlpha,
	dozingToLockscreenTransitionViewModel.lockscreenAlpha,		dozingToLockscreenTransitionViewModel.lockscreenAlpha,
	dozingToOccludedTransitionViewModel.lockscreenAlpha(viewState),		dozingToOccludedTransitionViewModel.lockscreenAlpha(viewState),
	dozingToPrimaryBouncerTransitionViewModel.notificationAlpha,		dozingToPrimaryBouncerTransitionViewModel.notificationAlpha,

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import com.android.systemui.keyguard.ui.viewmodel.aodToGoneTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.aodToLockscreenTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.aodToLockscreenTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.aodToOccludedTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.aodToOccludedTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.aodToPrimaryBouncerTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.aodToPrimaryBouncerTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.dozingToDreamingTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.dozingToGlanceableHubTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.dozingToGlanceableHubTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.dozingToLockscreenTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.dozingToLockscreenTransitionViewModel
	import com.android.systemui.keyguard.ui.viewmodel.dozingToOccludedTransitionViewModel		import com.android.systemui.keyguard.ui.viewmodel.dozingToOccludedTransitionViewModel
	@@ -82,7 +81,6 @@ val Kosmos.sharedNotificationContainerViewModel by Fixture {
	aodToLockscreenTransitionViewModel = aodToLockscreenTransitionViewModel,		aodToLockscreenTransitionViewModel = aodToLockscreenTransitionViewModel,
	aodToOccludedTransitionViewModel = aodToOccludedTransitionViewModel,		aodToOccludedTransitionViewModel = aodToOccludedTransitionViewModel,
	aodToPrimaryBouncerTransitionViewModel = aodToPrimaryBouncerTransitionViewModel,		aodToPrimaryBouncerTransitionViewModel = aodToPrimaryBouncerTransitionViewModel,
	dozingToDreamingTransitionViewModel = dozingToDreamingTransitionViewModel,
	dozingToGlanceableHubTransitionViewModel = dozingToGlanceableHubTransitionViewModel,		dozingToGlanceableHubTransitionViewModel = dozingToGlanceableHubTransitionViewModel,
	dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel,		dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel,
	dozingToOccludedTransitionViewModel = dozingToOccludedTransitionViewModel,		dozingToOccludedTransitionViewModel = dozingToOccludedTransitionViewModel,