Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e0e9c9c authored Apr 04, 2025 by Treehugger Robot Committed by Android (Google) Code Review Apr 04, 2025

Merge "Extract LauncherProxyService outside of recents package" into main

parents 72d72900 3785774c

packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorParameterizedTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.education.domain.interactor

		import android.content.pm.UserInfo
		import androidx.test.filters.SmallTest
		import com.android.systemui.LauncherProxyService.LauncherProxyListener
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.contextualeducation.GestureType
		import com.android.systemui.contextualeducation.GestureType.ALL_APPS
		@@ -34,7 +35,6 @@ import com.android.systemui.inputdevice.tutorial.data.repository.DeviceType
		import com.android.systemui.inputdevice.tutorial.tutorialSchedulerRepository
		import com.android.systemui.keyboard.data.repository.keyboardRepository
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener
		import com.android.systemui.testKosmos
		import com.android.systemui.touchpad.data.repository.touchpadRepository
		import com.android.systemui.user.data.repository.fakeUserRepository

packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.education.domain.interactor

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.LauncherProxyService.LauncherProxyListener
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.contextualeducation.GestureType
		import com.android.systemui.contextualeducation.GestureType.BACK
		@@ -32,7 +33,6 @@ import com.android.systemui.inputdevice.tutorial.data.repository.DeviceType
		import com.android.systemui.inputdevice.tutorial.tutorialSchedulerRepository
		import com.android.systemui.keyboard.data.repository.keyboardRepository
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener
		import com.android.systemui.testKosmos
		import com.android.systemui.touchpad.data.repository.touchpadRepository
		import com.google.common.truth.Truth.assertThat

packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/NavBarHelperTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
		import com.android.systemui.LauncherProxyService;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.accessibility.AccessibilityButtonModeObserver;
		import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;
		@@ -57,7 +58,6 @@ import com.android.systemui.accessibility.SystemActions;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;
		import com.android.systemui.recents.LauncherProxyService;
		import com.android.systemui.settings.DisplayTracker;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.CommandQueue;

packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,12 +4,12 @@ import android.app.ActivityManager
		import android.os.Handler
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.LauncherProxyService
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.model.SysUiState
		import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.recents.LauncherProxyService
		import com.android.systemui.settings.DisplayTracker
		import com.android.systemui.shared.system.QuickStepContract
		import com.android.systemui.shared.system.TaskStackChangeListeners

packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarButtonTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,12 +35,12 @@ import android.view.DisplayInfo;
		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		import com.android.systemui.LauncherProxyService;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.SysuiTestableContext;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.navigationbar.NavigationBarController;
		import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;
		import com.android.systemui.recents.LauncherProxyService;
		import com.android.systemui.settings.FakeDisplayTracker;
		import com.android.systemui.statusbar.policy.KeyguardStateController;