Merge "Create separate classes that are responsible for applying window root... (f4acbe21) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt

+10 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ import android.content.res.Configuration
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.testing.TestableLooper.RunWithLooper
		import android.view.Choreographer
		import android.view.MotionEvent
		import android.widget.FrameLayout
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		@@ -44,6 +46,7 @@ import com.android.systemui.settings.brightness.data.repository.BrightnessMirror
		import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor
		import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler
		import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor
		import com.android.systemui.statusbar.BlurUtils
		import com.android.systemui.statusbar.DragDownHelper
		import com.android.systemui.statusbar.LockscreenShadeTransitionController
		import com.android.systemui.statusbar.NotificationInsetsController
		@@ -66,6 +69,7 @@ import com.android.systemui.util.mockito.any
		import com.android.systemui.util.mockito.mock
		import com.android.systemui.util.mockito.whenever
		import com.android.systemui.util.time.FakeSystemClock
		import com.android.systemui.window.ui.viewmodel.WindowRootViewModel
		import com.google.common.truth.Truth.assertThat
		import java.util.Optional
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		@@ -91,6 +95,9 @@ import org.mockito.kotlin.eq
		@SmallTest
		class NotificationShadeWindowViewTest : SysuiTestCase() {

		@Mock private lateinit var choreographer: Choreographer
		@Mock private lateinit var blurUtils: BlurUtils
		@Mock private lateinit var windowRootViewModelFactory: WindowRootViewModel.Factory
		@Mock private lateinit var dragDownHelper: DragDownHelper
		@Mock private lateinit var statusBarStateController: SysuiStatusBarStateController
		@Mock private lateinit var shadeController: ShadeController
		@@ -168,6 +175,9 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
		testScope = TestScope()
		controller =
		NotificationShadeWindowViewController(
		blurUtils,
		windowRootViewModelFactory,
		choreographer,
		lockscreenShadeTransitionController,
		FalsingCollectorFake(),
		statusBarStateController,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt

+41 −2

Original line number	Diff line number	Diff line
		@@ -17,15 +17,19 @@
		package com.android.systemui.statusbar

		import android.os.IBinder
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.testing.TestableLooper.RunWithLooper
		import android.view.Choreographer
		import android.view.View
		import android.view.ViewRootImpl
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.ShadeInterpolation
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.res.R
		import com.android.systemui.shade.ShadeExpansionChangeEvent
		@@ -35,8 +39,10 @@ import com.android.systemui.statusbar.phone.ScrimController
		import com.android.systemui.statusbar.policy.FakeConfigurationController
		import com.android.systemui.statusbar.policy.KeyguardStateController
		import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController
		import com.android.systemui.testKosmos
		import com.android.systemui.util.WallpaperController
		import com.android.systemui.util.mockito.eq
		import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor
		import com.google.common.truth.Truth.assertThat
		import java.util.function.Consumer
		import org.junit.Before
		@@ -44,6 +50,7 @@ import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentCaptor
		import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.ArgumentMatchers.anyInt
		import org.mockito.ArgumentMatchers.floatThat
		import org.mockito.Captor
		@@ -63,7 +70,10 @@ import org.mockito.junit.MockitoJUnit
		@RunWithLooper
		@SmallTest
		class NotificationShadeDepthControllerTest : SysuiTestCase() {
		private val kosmos = testKosmos()

		private val applicationScope = kosmos.testScope.backgroundScope
		@Mock private lateinit var windowRootViewBlurInteractor: WindowRootViewBlurInteractor
		@Mock private lateinit var statusBarStateController: StatusBarStateController
		@Mock private lateinit var blurUtils: BlurUtils
		@Mock private lateinit var biometricUnlockController: BiometricUnlockController
		@@ -116,8 +126,11 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		dozeParameters,
		context,
		ResourcesSplitShadeStateController(),
		windowRootViewBlurInteractor,
		applicationScope,
		dumpManager,
		configurationController,)
		configurationController,
		)
		notificationShadeDepthController.shadeAnimation = shadeAnimation
		notificationShadeDepthController.brightnessMirrorSpring = brightnessSpring
		notificationShadeDepthController.root = root
		@@ -356,6 +369,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		}

		@Test
		@DisableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)
		fun ignoreShadeBlurUntilHidden_schedulesFrame() {
		notificationShadeDepthController.blursDisabledForAppLaunch = true
		verify(blurUtils).prepareBlur(any(), anyInt())
		@@ -363,6 +377,13 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		.postFrameCallback(eq(notificationShadeDepthController.updateBlurCallback))
		}

		@Test
		@EnableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)
		fun ignoreShadeBlurUntilHidden_requestsBlur_windowBlurFlag() {
		notificationShadeDepthController.blursDisabledForAppLaunch = true
		verify(windowRootViewBlurInteractor).requestBlurForShade(anyInt(), anyBoolean())
		}

		@Test
		fun ignoreBlurForUnlock_ignores() {
		notificationShadeDepthController.onPanelExpansionChanged(
		@@ -410,6 +431,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		}

		@Test
		@DisableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)
		fun brightnessMirror_hidesShadeBlur() {
		// Brightness mirror is fully visible
		`when`(brightnessSpring.ratio).thenReturn(1f)
		@@ -426,6 +448,23 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		verify(blurUtils).applyBlur(eq(viewRootImpl), eq(0), eq(false))
		}

		@Test
		@EnableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)
		fun brightnessMirror_hidesShadeBlur_withWindowBlurFlag() {
		// Brightness mirror is fully visible
		`when`(brightnessSpring.ratio).thenReturn(1f)
		// And shade is blurred
		notificationShadeDepthController.onPanelExpansionChanged(
		ShadeExpansionChangeEvent(fraction = 1f, expanded = true, tracking = false)
		)
		`when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat())

		notificationShadeDepthController.updateBlurCallback.doFrame(0)
		verify(notificationShadeWindowController).setBackgroundBlurRadius(eq(0))
		verify(wallpaperController).setNotificationShadeZoom(eq(1f))
		verify(windowRootViewBlurInteractor).requestBlurForShade(0, false)
		}

		@Test
		fun ignoreShadeBlurUntilHidden_whennNull_ignoresIfShadeHasNoBlur() {
		`when`(shadeAnimation.radius).thenReturn(0f)

packages/SystemUI/multivalentTests/src/com/android/systemui/window/domain/interactor/WindowRootViewBlurInteractorTest.kt

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.window.domain.interactor

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepository
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.runTest
		import org.junit.Test
		import org.junit.runner.RunWith

		@ExperimentalCoroutinesApi
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class WindowRootViewBlurInteractorTest : SysuiTestCase() {
		val kosmos = testKosmos()
		val testScope = kosmos.testScope

		val underTest by lazy { kosmos.windowRootViewBlurInteractor }

		@Test
		fun bouncerBlurIsAppliedImmediately() =
		testScope.runTest {
		val blurRadius by collectLastValue(underTest.blurRadius)
		val isBlurOpaque by collectLastValue(underTest.isBlurOpaque)

		underTest.requestBlurForBouncer(10)

		assertThat(blurRadius).isEqualTo(10)
		assertThat(isBlurOpaque).isFalse()
		}

		@Test
		fun shadeBlurIsNotAppliedWhenBouncerBlurIsActive() =
		testScope.runTest {
		kosmos.fakeKeyguardBouncerRepository.setPrimaryShow(true)

		assertThat(underTest.requestBlurForShade(30, true)).isFalse()
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/window/ui/viewmodel/WindowRootViewModelTest.kt

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.window.ui.viewmodel

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.lifecycle.activateIn
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		@ExperimentalCoroutinesApi
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class WindowRootViewModelTest : SysuiTestCase() {
		val kosmos = testKosmos()
		val testScope = kosmos.testScope

		val underTest by lazy { kosmos.windowRootViewModel }

		@Before
		fun setup() {
		underTest.activateIn(testScope)
		}

		@Test
		fun bouncerTransitionChangesWindowBlurRadius() =
		testScope.runTest {
		val blurState by collectLastValue(underTest.blurState)
		runCurrent()

		kosmos.fakeBouncerTransitions.first().windowBlurRadius.value = 30.0f
		runCurrent()

		assertThat(blurState).isEqualTo(BlurState(radius = 30, isOpaque = false))
		}
		}

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;

		import android.app.StatusBarManager;
		import android.util.Log;
		import android.view.Choreographer;
		import android.view.GestureDetector;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		@@ -60,6 +61,7 @@ import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirr
		import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor;
		import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;
		import com.android.systemui.shared.animation.DisableSubpixelTextTransitionListener;
		import com.android.systemui.statusbar.BlurUtils;
		import com.android.systemui.statusbar.DragDownHelper;
		import com.android.systemui.statusbar.LockscreenShadeTransitionController;
		import com.android.systemui.statusbar.NotificationInsetsController;
		@@ -79,6 +81,8 @@ import com.android.systemui.statusbar.window.StatusBarWindowStateController;
		import com.android.systemui.unfold.SysUIUnfoldComponent;
		import com.android.systemui.unfold.UnfoldTransitionProgressProvider;
		import com.android.systemui.util.time.SystemClock;
		import com.android.systemui.window.ui.WindowRootViewBinder;
		import com.android.systemui.window.ui.viewmodel.WindowRootViewModel;

		import kotlinx.coroutines.ExperimentalCoroutinesApi;

		@@ -160,6 +164,9 @@ public class NotificationShadeWindowViewController implements Dumpable {
		@ExperimentalCoroutinesApi
		@Inject
		public NotificationShadeWindowViewController(
		BlurUtils blurUtils,
		WindowRootViewModel.Factory windowRootViewModelFactory,
		Choreographer choreographer,
		LockscreenShadeTransitionController transitionController,
		FalsingCollector falsingCollector,
		SysuiStatusBarStateController statusBarStateController,
		@@ -259,9 +266,18 @@ public class NotificationShadeWindowViewController implements Dumpable {
		if (ShadeWindowGoesAround.isEnabled()) {
		mView.setConfigurationForwarder(configurationForwarder.get());
		}
		bindWindowRootView(blurUtils, windowRootViewModelFactory, choreographer);
		dumpManager.registerDumpable(this);
		}

		private void bindWindowRootView(BlurUtils blurUtils,
		WindowRootViewModel.Factory windowRootViewModelFactory, Choreographer choreographer) {
		if (SceneContainerFlag.isEnabled()) return;

		WindowRootViewBinder.INSTANCE.bind(mView, windowRootViewModelFactory, blurUtils,
		choreographer);
		}

		private void bindBouncer(BouncerViewBinder bouncerViewBinder) {
		mBouncerParentView = mView.findViewById(R.id.keyguard_bouncer_container);
		bouncerViewBinder.bind(mBouncerParentView);