diff options
36 files changed, 305 insertions, 306 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java index b087ecf1a488..6d75c4ca3a38 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java @@ -46,7 +46,7 @@ import androidx.test.filters.SmallTest; import com.android.app.viewcapture.ViewCaptureAwareWindowManager; import com.android.systemui.SysuiTestCase; import com.android.systemui.model.SysUiState; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.util.settings.SecureSettings; @@ -86,7 +86,7 @@ public class IMagnificationConnectionTest extends SysuiTestCase { @Mock private IRemoteMagnificationAnimationCallback mAnimationCallback; @Mock - private OverviewProxyService mOverviewProxyService; + private LauncherProxyService mLauncherProxyService; @Mock private SecureSettings mSecureSettings; @Mock @@ -114,7 +114,7 @@ public class IMagnificationConnectionTest extends SysuiTestCase { assertNotNull(mTestableLooper); mMagnification = new MagnificationImpl(getContext(), mTestableLooper.getLooper(), mContext.getMainExecutor(), mCommandQueue, - mModeSwitchesController, mSysUiState, mOverviewProxyService, mSecureSettings, + mModeSwitchesController, mSysUiState, mLauncherProxyService, mSecureSettings, mDisplayTracker, getContext().getSystemService(DisplayManager.class), mA11yLogger, mIWindowManager, mAccessibilityManager, mViewCaptureAwareWindowManager); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorParameterizedTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorParameterizedTest.kt index 5e023a203267..6899d23bcfd7 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorParameterizedTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorParameterizedTest.kt @@ -34,7 +34,7 @@ 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.OverviewProxyService.OverviewProxyListener +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 @@ -68,7 +68,7 @@ class KeyboardTouchpadEduInteractorParameterizedTest(private val gestureType: Ge private val keyboardRepository = kosmos.keyboardRepository private val tutorialSchedulerRepository = kosmos.tutorialSchedulerRepository private val userRepository = kosmos.fakeUserRepository - private val overviewProxyService = kosmos.mockOverviewProxyService + private val launcherProxyService = kosmos.mockLauncherProxyService private val underTest: KeyboardTouchpadEduInteractor = kosmos.keyboardTouchpadEduInteractor private val eduClock = kosmos.fakeEduClock @@ -519,8 +519,8 @@ class KeyboardTouchpadEduInteractorParameterizedTest(private val gestureType: Ge } private fun updateContextualEduStats(isTrackpadGesture: Boolean, gestureType: GestureType) { - val listenerCaptor = argumentCaptor<OverviewProxyListener>() - verify(overviewProxyService).addCallback(listenerCaptor.capture()) + val listenerCaptor = argumentCaptor<LauncherProxyListener>() + verify(launcherProxyService).addCallback(listenerCaptor.capture()) listenerCaptor.firstValue.updateContextualEduStats(isTrackpadGesture, gestureType) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt index 692b9c67f322..dc393c01dce1 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt @@ -32,7 +32,7 @@ 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.OverviewProxyService.OverviewProxyListener +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 @@ -58,7 +58,7 @@ class KeyboardTouchpadEduInteractorTest : SysuiTestCase() { private val touchpadRepository = kosmos.touchpadRepository private val keyboardRepository = kosmos.keyboardRepository private val tutorialSchedulerRepository = kosmos.tutorialSchedulerRepository - private val overviewProxyService = kosmos.mockOverviewProxyService + private val launcherProxyService = kosmos.mockLauncherProxyService private val underTest: KeyboardTouchpadEduInteractor = kosmos.keyboardTouchpadEduInteractor private val eduClock = kosmos.fakeEduClock @@ -167,16 +167,16 @@ class KeyboardTouchpadEduInteractorTest : SysuiTestCase() { keyboardRepository.setIsAnyKeyboardConnected(true) } - private fun getOverviewProxyListener(): OverviewProxyListener { - val listenerCaptor = argumentCaptor<OverviewProxyListener>() - verify(overviewProxyService).addCallback(listenerCaptor.capture()) + private fun getLauncherProxyListener(): LauncherProxyListener { + val listenerCaptor = argumentCaptor<LauncherProxyListener>() + verify(launcherProxyService).addCallback(listenerCaptor.capture()) return listenerCaptor.firstValue } private fun TestScope.triggerEducation(gestureType: GestureType) { // Increment max number of signal to try triggering education for (i in 1..KeyboardTouchpadEduInteractor.MAX_SIGNAL_COUNT) { - val listener = getOverviewProxyListener() + val listener = getLauncherProxyListener() listener.updateContextualEduStats(/* isTrackpadGesture= */ false, gestureType) } runCurrent() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/NavBarHelperTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/NavBarHelperTest.java index a770ee199ba6..c1872f05aa1d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/NavBarHelperTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/NavBarHelperTest.java @@ -57,7 +57,7 @@ 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.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.CommandQueue; @@ -104,7 +104,7 @@ public class NavBarHelperTest extends SysuiTestCase { @Mock SystemActions mSystemActions; @Mock - OverviewProxyService mOverviewProxyService; + LauncherProxyService mLauncherProxyService; @Mock Lazy<AssistManager> mAssistManagerLazy; @Mock @@ -161,7 +161,7 @@ public class NavBarHelperTest extends SysuiTestCase { mNavBarHelper = new NavBarHelper(mContext, mAccessibilityManager, mAccessibilityButtonModeObserver, mAccessibilityButtonTargetObserver, mAccessibilityGestureTargetObserver, - mSystemActions, mOverviewProxyService, mAssistManagerLazy, + mSystemActions, mLauncherProxyService, mAssistManagerLazy, () -> Optional.of(mock(CentralSurfaces.class)), mock(KeyguardStateController.class), mNavigationModeController, mEdgeBackGestureHandlerFactory, mWm, mUserTracker, mDisplayTracker, mNotificationShadeWindowController, mConfigurationController, @@ -171,7 +171,7 @@ public class NavBarHelperTest extends SysuiTestCase { @Test public void registerListenersInCtor() { verify(mNavigationModeController, times(1)).addListener(mNavBarHelper); - verify(mOverviewProxyService, times(1)).addCallback(mNavBarHelper); + verify(mLauncherProxyService, times(1)).addCallback(mNavBarHelper); verify(mCommandQueue, times(1)).addCallback(any()); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt index 9bae7bd72f7d..cf0a25020d93 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt @@ -9,7 +9,7 @@ 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.OverviewProxyService +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 @@ -49,7 +49,7 @@ class TaskbarDelegateTest : SysuiTestCase() { @Mock lateinit var mLightBarControllerFactory: LightBarTransitionsController.Factory @Mock lateinit var mLightBarTransitionController: LightBarTransitionsController @Mock lateinit var mCommandQueue: CommandQueue - @Mock lateinit var mOverviewProxyService: OverviewProxyService + @Mock lateinit var mLauncherProxyService: LauncherProxyService @Mock lateinit var mNavBarHelper: NavBarHelper @Mock lateinit var mNavigationModeController: NavigationModeController @Mock lateinit var mSysUiState: SysUiState @@ -87,7 +87,7 @@ class TaskbarDelegateTest : SysuiTestCase() { ) mTaskbarDelegate.setDependencies( mCommandQueue, - mOverviewProxyService, + mLauncherProxyService, mNavBarHelper, mNavigationModeController, mSysUiState, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarButtonTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarButtonTest.java index 00e79f5a3ac2..fd4bb4bb8a37 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarButtonTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarButtonTest.java @@ -40,7 +40,7 @@ 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.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -80,7 +80,7 @@ public class NavigationBarButtonTest extends SysuiTestCase { .thenReturn(mEdgeBackGestureHandler); mDependency.injectMockDependency(AssistManager.class); - mDependency.injectMockDependency(OverviewProxyService.class); + mDependency.injectMockDependency(LauncherProxyService.class); mDependency.injectMockDependency(KeyguardStateController.class); mDependency.injectMockDependency(NavigationBarController.class); mDependency.injectTestDependency(EdgeBackGestureHandler.Factory.class, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarInflaterViewTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarInflaterViewTest.java index e58c8f281fc1..85c093c16d88 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarInflaterViewTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarInflaterViewTest.java @@ -35,7 +35,7 @@ import com.android.systemui.assist.AssistManager; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.views.buttons.ButtonDispatcher; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import org.junit.After; import org.junit.Before; @@ -55,7 +55,7 @@ public class NavigationBarInflaterViewTest extends SysuiTestCase { @Before public void setUp() { mDependency.injectMockDependency(AssistManager.class); - mDependency.injectMockDependency(OverviewProxyService.class); + mDependency.injectMockDependency(LauncherProxyService.class); mDependency.injectMockDependency(NavigationModeController.class); mDependency.injectMockDependency(NavigationBarController.class); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTest.java index 17a1c27b029b..a6c9ff4d0cb9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTest.java @@ -106,7 +106,7 @@ import com.android.systemui.navigationbar.views.buttons.KeyButtonView; import com.android.systemui.navigationbar.views.buttons.NavBarButtonClickLogger; import com.android.systemui.navigationbar.views.buttons.NavbarOrientationTrackingLogger; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.recents.Recents; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.FakeDisplayTracker; @@ -185,7 +185,7 @@ public class NavigationBarTest extends SysuiTestCase { @Mock private SystemActions mSystemActions; @Mock - private OverviewProxyService mOverviewProxyService; + private LauncherProxyService mLauncherProxyService; @Mock private StatusBarStateController mStatusBarStateController; @Mock @@ -285,14 +285,14 @@ public class NavigationBarTest extends SysuiTestCase { mDependency.injectMockDependency(KeyguardStateController.class); mDependency.injectTestDependency(StatusBarStateController.class, mStatusBarStateController); mDependency.injectMockDependency(NavigationBarController.class); - mDependency.injectTestDependency(OverviewProxyService.class, mOverviewProxyService); + mDependency.injectTestDependency(LauncherProxyService.class, mLauncherProxyService); mDependency.injectTestDependency(NavigationModeController.class, mNavigationModeController); TestableLooper.get(this).runWithLooper(() -> { mNavBarHelper = spy(new NavBarHelper(mContext, mock(AccessibilityManager.class), mock(AccessibilityButtonModeObserver.class), mock(AccessibilityButtonTargetsObserver.class), mock(AccessibilityGestureTargetsObserver.class), - mSystemActions, mOverviewProxyService, + mSystemActions, mLauncherProxyService, () -> mock(AssistManager.class), () -> Optional.of(mCentralSurfaces), mKeyguardStateController, mock(NavigationModeController.class), mEdgeBackGestureHandlerFactory, mock(IWindowManager.class), @@ -700,7 +700,7 @@ public class NavigationBarTest extends SysuiTestCase { mock(AccessibilityManager.class), deviceProvisionedController, new MetricsLogger(), - mOverviewProxyService, + mLauncherProxyService, mNavigationModeController, mStatusBarStateController, mStatusBarKeyguardViewManager, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTransitionsTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTransitionsTest.java index 3621ab975daf..cff9beccc729 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTransitionsTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/NavigationBarTransitionsTest.java @@ -36,7 +36,7 @@ import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.shared.statusbar.phone.BarTransitions; import com.android.systemui.statusbar.phone.LightBarTransitionsController; @@ -72,7 +72,7 @@ public class NavigationBarTransitionsTest extends SysuiTestCase { when(mEdgeBackGestureHandlerFactory.create(any(Context.class))) .thenReturn(mEdgeBackGestureHandler); mDependency.injectMockDependency(AssistManager.class); - mDependency.injectMockDependency(OverviewProxyService.class); + mDependency.injectMockDependency(LauncherProxyService.class); mDependency.injectMockDependency(StatusBarStateController.class); mDependency.injectMockDependency(KeyguardStateController.class); mDependency.injectMockDependency(NavigationBarController.class); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/buttons/KeyButtonViewTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/buttons/KeyButtonViewTest.java index 403a883e1760..58ec0c7a0e72 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/buttons/KeyButtonViewTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/views/buttons/KeyButtonViewTest.java @@ -51,7 +51,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.systemui.SysuiTestCase; import com.android.systemui.assist.AssistManager; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import org.junit.Before; import org.junit.Test; @@ -76,7 +76,7 @@ public class KeyButtonViewTest extends SysuiTestCase { public void setup() throws Exception { MockitoAnnotations.initMocks(this); mMetricsLogger = mDependency.injectMockDependency(MetricsLogger.class); - mDependency.injectMockDependency(OverviewProxyService.class); + mDependency.injectMockDependency(LauncherProxyService.class); mDependency.injectMockDependency(AssistManager.class); mUiEventLogger = mDependency.injectMockDependency(UiEventLogger.class); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java index 0713a247a4a3..baaf6c9a76ae 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java @@ -84,7 +84,7 @@ import com.android.systemui.flags.FakeFeatureFlagsClassic; import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.log.LogWtfHandlerRule; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.NotificationLockscreenUserManager.NotificationStateChangedListener; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -156,7 +156,7 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { @Mock private NotificationClickNotifier mClickNotifier; @Mock - private OverviewProxyService mOverviewProxyService; + private LauncherProxyService mLauncherProxyService; @Mock private KeyguardManager mKeyguardManager; @Mock @@ -1142,7 +1142,7 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { (() -> mVisibilityProvider), (() -> mNotifCollection), mClickNotifier, - (() -> mOverviewProxyService), + (() -> mLauncherProxyService), NotificationLockscreenUserManagerTest.this.mKeyguardManager, mStatusBarStateController, mMainExecutor, diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ILauncherProxy.aidl index 011458859db4..b43ffc530289 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ILauncherProxy.aidl @@ -24,7 +24,7 @@ import android.view.MotionEvent; import com.android.systemui.shared.recents.ISystemUiProxy; // Next ID: 39 -oneway interface IOverviewProxy { +oneway interface ILauncherProxy { void onActiveNavBarRegionChanges(in Region activeRegion) = 11; @@ -140,7 +140,7 @@ oneway interface IOverviewProxy { void appTransitionPending(boolean pending) = 34; /** - * Sent right after OverviewProxy calls unbindService() on the TouchInteractionService. + * Sent right after LauncherProxyService calls unbindService() on the TouchInteractionService. * TouchInteractionService is expected to send the reply once it has finished cleaning up. */ void onUnbind(IRemoteCallback reply) = 35; diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl index e332280bc31a..1f6bea18d53a 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl @@ -69,10 +69,10 @@ interface ISystemUiProxy { /** * Indicates that the given Assist invocation types should be handled by Launcher via - * OverviewProxy#onAssistantOverrideInvoked and should not be invoked by SystemUI. + * LauncherProxy#onAssistantOverrideInvoked and should not be invoked by SystemUI. * * @param invocationTypes The invocation types that will henceforth be handled via - * OverviewProxy (Launcher); other invocation types should be handled by SysUI. + * LauncherProxy (Launcher); other invocation types should be handled by SysUI. */ oneway void setAssistantOverridesRequested(in int[] invocationTypes) = 53; diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 40c1f0f9895d..4a8e4ed3f6f1 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -39,7 +39,7 @@ import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.PluginManager; import com.android.systemui.plugins.VolumeDialogController; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationMediaManager; @@ -129,7 +129,7 @@ public class Dependency { @Inject Lazy<MetricsLogger> mMetricsLogger; @Inject Lazy<UiOffloadThread> mUiOffloadThread; @Inject Lazy<LightBarController> mLightBarController; - @Inject Lazy<OverviewProxyService> mOverviewProxyService; + @Inject Lazy<LauncherProxyService> mLauncherProxyService; @Inject Lazy<NavigationModeController> mNavBarModeController; @Inject Lazy<NavigationBarController> mNavigationBarController; @Inject Lazy<StatusBarStateController> mStatusBarStateController; @@ -175,7 +175,7 @@ public class Dependency { mProviders.put(MetricsLogger.class, mMetricsLogger::get); mProviders.put(UiOffloadThread.class, mUiOffloadThread::get); mProviders.put(LightBarController.class, mLightBarController::get); - mProviders.put(OverviewProxyService.class, mOverviewProxyService::get); + mProviders.put(LauncherProxyService.class, mLauncherProxyService::get); mProviders.put(NavigationModeController.class, mNavBarModeController::get); mProviders.put(NavigationBarController.class, mNavigationBarController::get); mProviders.put(StatusBarStateController.class, mStatusBarStateController::get); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java index 5cba464fc24c..5482c3d3ea18 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java @@ -50,7 +50,7 @@ import com.android.internal.graphics.SfVsyncFrameCallbackProvider; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.model.SysUiState; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.util.settings.SecureSettings; @@ -79,7 +79,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks private final Executor mExecutor; private final AccessibilityManager mAccessibilityManager; private final CommandQueue mCommandQueue; - private final OverviewProxyService mOverviewProxyService; + private final LauncherProxyService mLauncherProxyService; private final DisplayTracker mDisplayTracker; private final AccessibilityLogger mA11yLogger; @@ -225,13 +225,13 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks public MagnificationImpl(Context context, @Main Handler mainHandler, @Main Executor executor, CommandQueue commandQueue, ModeSwitchesController modeSwitchesController, - SysUiState sysUiState, OverviewProxyService overviewProxyService, + SysUiState sysUiState, LauncherProxyService launcherProxyService, SecureSettings secureSettings, DisplayTracker displayTracker, DisplayManager displayManager, AccessibilityLogger a11yLogger, IWindowManager iWindowManager, AccessibilityManager accessibilityManager, ViewCaptureAwareWindowManager viewCaptureAwareWindowManager) { this(context, mainHandler.getLooper(), executor, commandQueue, - modeSwitchesController, sysUiState, overviewProxyService, secureSettings, + modeSwitchesController, sysUiState, launcherProxyService, secureSettings, displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager, viewCaptureAwareWindowManager); } @@ -239,7 +239,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks @VisibleForTesting public MagnificationImpl(Context context, Looper looper, @Main Executor executor, CommandQueue commandQueue, ModeSwitchesController modeSwitchesController, - SysUiState sysUiState, OverviewProxyService overviewProxyService, + SysUiState sysUiState, LauncherProxyService launcherProxyService, SecureSettings secureSettings, DisplayTracker displayTracker, DisplayManager displayManager, AccessibilityLogger a11yLogger, IWindowManager iWindowManager, @@ -258,7 +258,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks mCommandQueue = commandQueue; mModeSwitchesController = modeSwitchesController; mSysUiState = sysUiState; - mOverviewProxyService = overviewProxyService; + mLauncherProxyService = launcherProxyService; mDisplayTracker = displayTracker; mA11yLogger = a11yLogger; mWindowMagnificationControllerSupplier = new WindowMagnificationControllerSupplier(context, @@ -279,7 +279,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks @Override public void start() { mCommandQueue.addCallback(this); - mOverviewProxyService.addCallback(new OverviewProxyService.OverviewProxyListener() { + mLauncherProxyService.addCallback(new LauncherProxyService.LauncherProxyListener() { @Override public void onConnectionChanged(boolean isConnected) { if (isConnected) { diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 939d96e67f8f..da1c1bc49d23 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -37,7 +37,7 @@ import com.android.systemui.assist.ui.DefaultUiController; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.model.SysUiState; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.res.R; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; @@ -142,7 +142,7 @@ public class AssistManager { protected final Context mContext; private final AssistDisclosure mAssistDisclosure; private final PhoneStateMonitor mPhoneStateMonitor; - private final OverviewProxyService mOverviewProxyService; + private final LauncherProxyService mLauncherProxyService; private final UiController mUiController; protected final Lazy<SysUiState> mSysUiState; protected final AssistLogger mAssistLogger; @@ -176,7 +176,7 @@ public class AssistManager { private final CommandQueue mCommandQueue; protected final AssistUtils mAssistUtils; - // Invocation types that should be sent over OverviewProxy instead of handled here. + // Invocation types that should be sent over LauncherProxy instead of handled here. private int[] mAssistOverrideInvocationTypes; @Inject @@ -186,7 +186,7 @@ public class AssistManager { AssistUtils assistUtils, CommandQueue commandQueue, PhoneStateMonitor phoneStateMonitor, - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, Lazy<SysUiState> sysUiState, DefaultUiController defaultUiController, AssistLogger assistLogger, @@ -203,7 +203,7 @@ public class AssistManager { mCommandQueue = commandQueue; mAssistUtils = assistUtils; mAssistDisclosure = new AssistDisclosure(context, uiHandler, viewCaptureAwareWindowManager); - mOverviewProxyService = overviewProxyService; + mLauncherProxyService = launcherProxyService; mPhoneStateMonitor = phoneStateMonitor; mAssistLogger = assistLogger; mUserTracker = userTracker; @@ -220,7 +220,7 @@ public class AssistManager { mSysUiState = sysUiState; - mOverviewProxyService.addCallback(new OverviewProxyService.OverviewProxyListener() { + mLauncherProxyService.addCallback(new LauncherProxyService.LauncherProxyListener() { @Override public void onAssistantProgress(float progress) { // Progress goes from 0 to 1 to indicate how close the assist gesture is to @@ -288,14 +288,14 @@ public class AssistManager { } if (shouldOverrideAssist(args)) { try { - if (mOverviewProxyService.getProxy() == null) { - Log.w(TAG, "No OverviewProxyService to invoke assistant override"); + if (mLauncherProxyService.getProxy() == null) { + Log.w(TAG, "No LauncherProxyService to invoke assistant override"); return; } - mOverviewProxyService.getProxy().onAssistantOverrideInvoked( + mLauncherProxyService.getProxy().onAssistantOverrideInvoked( args.getInt(INVOCATION_TYPE_KEY)); } catch (RemoteException e) { - Log.w(TAG, "Unable to invoke assistant via OverviewProxyService override", e); + Log.w(TAG, "Unable to invoke assistant via LauncherProxyService override", e); } return; } @@ -333,7 +333,7 @@ public class AssistManager { return shouldOverrideAssist(invocationType); } - /** @return true if the invocation type should be handled by OverviewProxy instead of SysUI. */ + /** @return true if the invocation type should be handled by LauncherProxy instead of SysUI. */ public boolean shouldOverrideAssist(int invocationType) { return mAssistOverrideInvocationTypes != null && Arrays.stream(mAssistOverrideInvocationTypes).anyMatch( @@ -342,7 +342,7 @@ public class AssistManager { /** * @param invocationTypes The invocation types that will henceforth be handled via - * OverviewProxy (Launcher); other invocation types should be handled by + * LauncherProxy (Launcher); other invocation types should be handled by * this class. */ public void setAssistantOverridesRequested(int[] invocationTypes) { diff --git a/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt b/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt index d7a4dba3188a..9bdf812713d7 100644 --- a/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt @@ -37,8 +37,8 @@ import com.android.systemui.inputdevice.tutorial.data.repository.DeviceType import com.android.systemui.inputdevice.tutorial.data.repository.DeviceType.KEYBOARD import com.android.systemui.inputdevice.tutorial.data.repository.DeviceType.TOUCHPAD import com.android.systemui.inputdevice.tutorial.data.repository.TutorialSchedulerRepository -import com.android.systemui.recents.OverviewProxyService -import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener +import com.android.systemui.recents.LauncherProxyService +import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import java.time.Clock import java.time.Instant @@ -67,7 +67,7 @@ constructor( private val contextualEducationInteractor: ContextualEducationInteractor, private val userInputDeviceRepository: UserInputDeviceRepository, private val tutorialRepository: TutorialSchedulerRepository, - private val overviewProxyService: OverviewProxyService, + private val launcherProxyService: LauncherProxyService, private val metricsLogger: ContextualEducationMetricsLogger, @EduClock private val clock: Clock, ) : CoreStartable { @@ -100,8 +100,8 @@ constructor( val educationTriggered = _educationTriggered.asStateFlow() private val statsUpdateRequests: Flow<StatsUpdateRequest> = conflatedCallbackFlow { - val listener: OverviewProxyListener = - object : OverviewProxyListener { + val listener: LauncherProxyListener = + object : LauncherProxyListener { override fun updateContextualEduStats( isTrackpadGesture: Boolean, gestureType: GestureType, @@ -113,8 +113,8 @@ constructor( } } - overviewProxyService.addCallback(listener) - awaitClose { overviewProxyService.removeCallback(listener) } + launcherProxyService.addCallback(listener) + awaitClose { launcherProxyService.removeCallback(listener) } } private val gestureModelMap: Flow<Map<GestureType, GestureEduModel>> = diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/InWindowLauncherUnlockAnimationManager.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/InWindowLauncherUnlockAnimationManager.kt index eb005f226cf1..454ba9af5745 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/InWindowLauncherUnlockAnimationManager.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/InWindowLauncherUnlockAnimationManager.kt @@ -76,9 +76,8 @@ constructor( private var manualUnlockAmount: Float? = null /** - * Called from [OverviewProxyService] to provide us with the launcher unlock animation - * controller, which can be used to start and update the unlock animation in the launcher - * process. + * Called from Launcher to provide us with the launcher unlock animation controller, which can + * be used to start and update the unlock animation in the launcher process. */ override fun setLauncherUnlockController( activityClass: String, @@ -117,7 +116,7 @@ constructor( launcher.prepareForUnlock( false, Rect(), - 0 + 0, ) // TODO(b/293894758): Add smartspace animation support. } } @@ -134,14 +133,14 @@ constructor( Log.e( TAG, "Called prepareForUnlock(), but not playUnlockAnimation(). " + - "Failing-safe by calling setUnlockAmount(1f)" + "Failing-safe by calling setUnlockAmount(1f)", ) setUnlockAmount(1f, forceIfAnimating = true) } else if (manualUnlockSetButNotFullyVisible) { Log.e( TAG, "Unlock has ended, but manual unlock amount != 1f. " + - "Failing-safe by calling setUnlockAmount(1f)" + "Failing-safe by calling setUnlockAmount(1f)", ) setUnlockAmount(1f, forceIfAnimating = true) } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java index 0de8c40bddaa..1807847e3f3c 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java @@ -77,7 +77,7 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shared.Flags; @@ -115,7 +115,7 @@ public final class NavBarHelper implements AccessibilityButtonModeObserver.ModeChangedListener, AccessibilityButtonTargetsObserver.TargetsChangedListener, AccessibilityGestureTargetsObserver.TargetsChangedListener, - OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener, + LauncherProxyService.LauncherProxyListener, NavigationModeController.ModeChangedListener, Dumpable, CommandQueue.Callbacks, ConfigurationController.ConfigurationListener { private static final String TAG = NavBarHelper.class.getSimpleName(); @@ -199,7 +199,7 @@ public final class NavBarHelper implements AccessibilityButtonTargetsObserver accessibilityButtonTargetsObserver, AccessibilityGestureTargetsObserver accessibilityGestureTargetsObserver, SystemActions systemActions, - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, Lazy<AssistManager> assistManagerLazy, Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy, KeyguardStateController keyguardStateController, @@ -240,7 +240,7 @@ public final class NavBarHelper implements mNavBarMode = navigationModeController.addListener(this); mCommandQueue.addCallback(this); configurationController.addCallback(this); - overviewProxyService.addCallback(this); + launcherProxyService.addCallback(this); dumpManager.registerDumpable(this); } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java index 645bd0b4b441..ebda3765cf90 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java @@ -52,7 +52,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.views.NavigationBar; import com.android.systemui.navigationbar.views.NavigationBarView; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.statusbar.phone.BarTransitions.TransitionMode; import com.android.systemui.shared.system.TaskStackChangeListeners; @@ -115,7 +115,7 @@ public class NavigationBarControllerImpl implements @Inject public NavigationBarControllerImpl(Context context, - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, NavigationModeController navigationModeController, SysUiState sysUiFlagsContainer, CommandQueue commandQueue, @@ -145,7 +145,7 @@ public class NavigationBarControllerImpl implements mNavMode = navigationModeController.addListener(this); mNavBarHelper = navBarHelper; mTaskbarDelegate = taskbarDelegate; - mTaskbarDelegate.setDependencies(commandQueue, overviewProxyService, + mTaskbarDelegate.setDependencies(commandQueue, launcherProxyService, navBarHelper, navigationModeController, sysUiFlagsContainer, dumpManager, autoHideControllerStore.forDisplay(mContext.getDisplayId()), lightBarController, pipOptional, backAnimation.orElse(null), diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index de35dd7b52b6..823c912d06be 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java @@ -70,7 +70,7 @@ 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.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.recents.utilities.Utilities; import com.android.systemui.shared.statusbar.phone.BarTransitions; @@ -96,7 +96,7 @@ import javax.inject.Inject; /** */ @SysUISingleton public class TaskbarDelegate implements CommandQueue.Callbacks, - OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener, + LauncherProxyService.LauncherProxyListener, NavigationModeController.ModeChangedListener, Dumpable { private static final String TAG = TaskbarDelegate.class.getSimpleName(); @@ -104,7 +104,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, private final LightBarTransitionsController.Factory mLightBarTransitionsControllerFactory; private boolean mInitialized; private CommandQueue mCommandQueue; - private OverviewProxyService mOverviewProxyService; + private LauncherProxyService mLauncherProxyService; private NavBarHelper mNavBarHelper; private NavigationModeController mNavigationModeController; private SysUiState mSysUiState; @@ -210,7 +210,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, } public void setDependencies(CommandQueue commandQueue, - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, NavBarHelper navBarHelper, NavigationModeController navigationModeController, SysUiState sysUiState, DumpManager dumpManager, @@ -222,7 +222,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, DisplayTracker displayTracker) { // TODO: adding this in the ctor results in a dagger dependency cycle :( mCommandQueue = commandQueue; - mOverviewProxyService = overviewProxyService; + mLauncherProxyService = launcherProxyService; mNavBarHelper = navBarHelper; mNavigationModeController = navigationModeController; mSysUiState = sysUiState; @@ -240,12 +240,12 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onDisplayReady(int displayId) { CommandQueue.Callbacks.super.onDisplayReady(displayId); - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().onDisplayReady(displayId); + mLauncherProxyService.getProxy().onDisplayReady(displayId); } catch (RemoteException e) { Log.e(TAG, "onDisplayReady() failed", e); } @@ -254,12 +254,12 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onDisplayRemoved(int displayId) { CommandQueue.Callbacks.super.onDisplayRemoved(displayId); - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().onDisplayRemoved(displayId); + mLauncherProxyService.getProxy().onDisplayRemoved(displayId); } catch (RemoteException e) { Log.e(TAG, "onDisplayRemoved() failed", e); } @@ -268,12 +268,12 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onDisplayRemoveSystemDecorations(int displayId) { CommandQueue.Callbacks.super.onDisplayRemoveSystemDecorations(displayId); - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().onDisplayRemoveSystemDecorations(displayId); + mLauncherProxyService.getProxy().onDisplayRemoveSystemDecorations(displayId); } catch (RemoteException e) { Log.e(TAG, "onDisplaySystemDecorationsRemoved() failed", e); } @@ -287,7 +287,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void applyDarkIntensity(float darkIntensity) { mBgHandler.post(() -> { - mOverviewProxyService.onNavButtonsDarkIntensityChanged(darkIntensity); + mLauncherProxyService.onNavButtonsDarkIntensityChanged(darkIntensity); }); } @@ -309,7 +309,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, mDefaultDisplayId = displayId; parseCurrentSysuiState(); mCommandQueue.addCallback(this); - mOverviewProxyService.addCallback(this); + mLauncherProxyService.addCallback(this); onNavigationModeChanged(mNavigationModeController.addListener(this)); mNavBarHelper.registerNavTaskStateUpdater(mNavbarTaskbarStateUpdater); // Initialize component callback @@ -334,7 +334,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, return; } mCommandQueue.removeCallback(this); - mOverviewProxyService.removeCallback(this); + mLauncherProxyService.removeCallback(this); mNavigationModeController.removeListener(this); mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater); mScreenPinningNotify = null; @@ -401,43 +401,43 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, } void onTransitionModeUpdated(int barMode, boolean checkBarModes) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().onTransitionModeUpdated(barMode, checkBarModes); + mLauncherProxyService.getProxy().onTransitionModeUpdated(barMode, checkBarModes); } catch (RemoteException e) { Log.e(TAG, "onTransitionModeUpdated() failed, barMode: " + barMode, e); } } void checkNavBarModes(int displayId) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().checkNavBarModes(displayId); + mLauncherProxyService.getProxy().checkNavBarModes(displayId); } catch (RemoteException e) { Log.e(TAG, "checkNavBarModes() failed", e); } } void finishBarAnimations(int displayId) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().finishBarAnimations(displayId); + mLauncherProxyService.getProxy().finishBarAnimations(displayId); } catch (RemoteException e) { Log.e(TAG, "finishBarAnimations() failed", e); } } void touchAutoDim(int displayId) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } @@ -445,31 +445,31 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, int state = mStatusBarStateController.getState(); boolean shouldReset = state != StatusBarState.KEYGUARD && state != StatusBarState.SHADE_LOCKED; - mOverviewProxyService.getProxy().touchAutoDim(displayId, shouldReset); + mLauncherProxyService.getProxy().touchAutoDim(displayId, shouldReset); } catch (RemoteException e) { Log.e(TAG, "touchAutoDim() failed", e); } } void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, boolean animate) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().transitionTo(displayId, barMode, animate); + mLauncherProxyService.getProxy().transitionTo(displayId, barMode, animate); } catch (RemoteException e) { Log.e(TAG, "transitionTo() failed, barMode: " + barMode, e); } } private void updateAssistantAvailability(boolean assistantAvailable, boolean longPressHomeEnabled) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().onAssistantAvailable(assistantAvailable, + mLauncherProxyService.getProxy().onAssistantAvailable(assistantAvailable, longPressHomeEnabled); } catch (RemoteException e) { Log.e(TAG, "onAssistantAvailable() failed, available: " + assistantAvailable, e); @@ -477,24 +477,24 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, } private void updateWallpaperVisible(int displayId, boolean visible) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().updateWallpaperVisibility(displayId, visible); + mLauncherProxyService.getProxy().updateWallpaperVisibility(displayId, visible); } catch (RemoteException e) { Log.e(TAG, "updateWallpaperVisibility() failed, visible: " + visible, e); } } private void appTransitionPending(boolean pending) { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().appTransitionPending(pending); + mLauncherProxyService.getProxy().appTransitionPending(pending); } catch (RemoteException e) { Log.e(TAG, "appTransitionPending() failed, pending: " + pending, e); } @@ -528,14 +528,14 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onRotationProposal(int rotation, boolean isValid) { - mOverviewProxyService.onRotationProposal(rotation, isValid); + mLauncherProxyService.onRotationProposal(rotation, isValid); } @Override public void disable(int displayId, int state1, int state2, boolean animate) { mDisabledFlags = state1; updateSysuiFlags(); - mOverviewProxyService.disable(displayId, state1, state2, animate); + mLauncherProxyService.disable(displayId, state1, state2, animate); } @Override @@ -543,7 +543,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, int behavior, @InsetsType int requestedVisibleTypes, String packageName, LetterboxDetails[] letterboxDetails) { - mOverviewProxyService.onSystemBarAttributesChanged(displayId, behavior); + mLauncherProxyService.onSystemBarAttributesChanged(displayId, behavior); boolean nbModeChanged = false; if (mAppearance != appearance) { mAppearance = appearance; @@ -596,12 +596,12 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void toggleTaskbar() { - if (mOverviewProxyService.getProxy() == null) { + if (mLauncherProxyService.getProxy() == null) { return; } try { - mOverviewProxyService.getProxy().onTaskbarToggled(); + mLauncherProxyService.getProxy().onTaskbarToggled(); } catch (RemoteException e) { Log.e(TAG, "onTaskbarToggled() failed", e); } @@ -673,7 +673,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void setNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { - mOverviewProxyService.onNavigationBarLumaSamplingEnabled(displayId, enable); + mLauncherProxyService.onNavigationBarLumaSamplingEnabled(displayId, enable); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java index 1c94f56f0942..f44c2c01951c 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java @@ -85,7 +85,7 @@ import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.NavigationEdgeBackPlugin; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.PluginManager; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.res.R; import com.android.systemui.settings.UserTracker; import com.android.systemui.shared.system.ActivityManagerWrapper; @@ -155,8 +155,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack } }; - private OverviewProxyService.OverviewProxyListener mQuickSwitchListener = - new OverviewProxyService.OverviewProxyListener() { + private LauncherProxyService.LauncherProxyListener mQuickSwitchListener = + new LauncherProxyService.LauncherProxyListener() { @Override public void onPrioritizedRotation(@Surface.Rotation int rotation) { mStartingQuickstepRotation = rotation; @@ -197,7 +197,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private final Context mContext; private final UserTracker mUserTracker; - private final OverviewProxyService mOverviewProxyService; + private final LauncherProxyService mLauncherProxyService; private final SysUiState mSysUiState; private Runnable mStateChangeCallback; private Consumer<Boolean> mButtonForcedVisibleCallback; @@ -332,7 +332,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack : SysUiStatsLog.BACK_GESTURE__TYPE__COMPLETED); if (!mInRejectedExclusion) { // Log successful back gesture to contextual edu stats - mOverviewProxyService.updateContextualEduStats(mIsTrackpadThreeFingerSwipe, + mLauncherProxyService.updateContextualEduStats(mIsTrackpadThreeFingerSwipe, GestureType.BACK); } } @@ -441,7 +441,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack @AssistedInject EdgeBackGestureHandler( @Assisted Context context, - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, SysUiState sysUiState, PluginManager pluginManager, @BackPanelUiThread UiThreadContext uiThreadContext, @@ -468,7 +468,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mBackgroundExecutor = backgroundExecutor; mBgHandler = bgHandler; mUserTracker = userTracker; - mOverviewProxyService = overviewProxyService; + mLauncherProxyService = launcherProxyService; mSysUiState = sysUiState; mPluginManager = pluginManager; mNavigationModeController = navigationModeController; @@ -620,7 +620,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack */ public void onNavBarAttached() { mIsAttached = true; - mOverviewProxyService.addCallback(mQuickSwitchListener); + mLauncherProxyService.addCallback(mQuickSwitchListener); mSysUiState.addCallback(mSysUiStateCallback); mInputManager.registerInputDeviceListener(mInputDeviceListener, mBgHandler); int[] inputDevices = mInputManager.getInputDeviceIds(); @@ -636,7 +636,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack */ public void onNavBarDetached() { mIsAttached = false; - mOverviewProxyService.removeCallback(mQuickSwitchListener); + mLauncherProxyService.removeCallback(mQuickSwitchListener); mSysUiState.removeCallback(mSysUiStateCallback); mInputManager.unregisterInputDeviceListener(mInputDeviceListener); mTrackpadsConnected.clear(); diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java index f1fe2802286c..b5ebb269b2c0 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java @@ -36,7 +36,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL; import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.HOME_BUTTON_LONG_PRESS_DURATION_MS; import static com.android.systemui.navigationbar.NavBarHelper.transitionMode; -import static com.android.systemui.recents.OverviewProxyService.OverviewProxyListener; +import static com.android.systemui.recents.LauncherProxyService.LauncherProxyListener; import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen; import static com.android.systemui.shared.rotation.RotationButtonController.DEBUG_ROTATION; import static com.android.systemui.shared.statusbar.phone.BarTransitions.MODE_OPAQUE; @@ -131,7 +131,7 @@ import com.android.systemui.navigationbar.views.buttons.KeyButtonView; import com.android.systemui.navigationbar.views.buttons.NavBarButtonClickLogger; import com.android.systemui.navigationbar.views.buttons.NavbarOrientationTrackingLogger; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.recents.Recents; import com.android.systemui.res.R; import com.android.systemui.settings.DisplayTracker; @@ -212,7 +212,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements private final ShadeViewController mShadeViewController; private final PanelExpansionInteractor mPanelExpansionInteractor; private final NotificationRemoteInputManager mNotificationRemoteInputManager; - private final OverviewProxyService mOverviewProxyService; + private final LauncherProxyService mLauncherProxyService; private final NavigationModeController mNavigationModeController; private final UserTracker mUserTracker; private final CommandQueue mCommandQueue; @@ -283,7 +283,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements * gesture to indicate to them that they can continue in that orientation without having to * rotate the phone * The secondary handle will show when we get - * {@link OverviewProxyListener#notifyPrioritizedRotation(int)} callback with the + * {@link LauncherProxyListener#notifyPrioritizedRotation(int)} callback with the * original handle hidden and we'll flip the visibilities once the * {@link #mTasksFrozenListener} fires */ @@ -387,12 +387,12 @@ public class NavigationBar extends ViewController<NavigationBarView> implements } }; - private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() { + private final LauncherProxyListener mLauncherProxyListener = new LauncherProxyListener() { @Override public void onConnectionChanged(boolean isConnected) { - mView.onOverviewProxyConnectionChange( - mOverviewProxyService.isEnabled()); - mView.setShouldShowSwipeUpUi(mOverviewProxyService.shouldShowSwipeUpUI()); + mView.onLauncherProxyConnectionChange( + mLauncherProxyService.isEnabled()); + mView.setShouldShowSwipeUpUi(mLauncherProxyService.shouldShowSwipeUpUI()); updateScreenPinningGestures(); } @@ -565,7 +565,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements AccessibilityManager accessibilityManager, DeviceProvisionedController deviceProvisionedController, MetricsLogger metricsLogger, - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, NavigationModeController navigationModeController, StatusBarStateController statusBarStateController, StatusBarKeyguardViewManager statusBarKeyguardViewManager, @@ -618,7 +618,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mShadeViewController = shadeViewController; mPanelExpansionInteractor = panelExpansionInteractor; mNotificationRemoteInputManager = notificationRemoteInputManager; - mOverviewProxyService = overviewProxyService; + mLauncherProxyService = launcherProxyService; mNavigationModeController = navigationModeController; mUserTracker = userTracker; mCommandQueue = commandQueue; @@ -827,7 +827,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements setNavBarMode(mNavBarMode); repositionNavigationBar(mCurrentRotation); mView.setUpdateActiveTouchRegionsCallback( - () -> mOverviewProxyService.onActiveNavBarRegionChanges( + () -> mLauncherProxyService.onActiveNavBarRegionChanges( getButtonLocations(true /* inScreen */, true /* useNearestRegion */))); mView.getViewTreeObserver().addOnComputeInternalInsetsListener( @@ -843,7 +843,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mWakefulnessLifecycle.addObserver(mWakefulnessObserver); notifyNavigationBarScreenOn(); - mOverviewProxyService.addCallback(mOverviewProxyListener); + mLauncherProxyService.addCallback(mLauncherProxyListener); updateSystemUiStateFlags(); // Currently there is no accelerometer sensor on non-default display. @@ -881,7 +881,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements public void onViewDetached() { mView.setUpdateActiveTouchRegionsCallback(null); getBarTransitions().destroy(); - mOverviewProxyService.removeCallback(mOverviewProxyListener); + mLauncherProxyService.removeCallback(mLauncherProxyListener); mUserTracker.removeCallback(mUserChangedCallback); mWakefulnessLifecycle.removeObserver(mWakefulnessObserver); if (mOrientationHandle != null) { @@ -1699,9 +1699,9 @@ public class NavigationBar extends ViewController<NavigationBarView> implements private void updateAssistantEntrypoints(boolean assistantAvailable, boolean longPressHomeEnabled) { - if (mOverviewProxyService.getProxy() != null) { + if (mLauncherProxyService.getProxy() != null) { try { - mOverviewProxyService.getProxy().onAssistantAvailable(assistantAvailable, + mLauncherProxyService.getProxy().onAssistantAvailable(assistantAvailable, longPressHomeEnabled); } catch (RemoteException e) { Log.w(TAG, "Unable to send assistant availability data to launcher"); @@ -2109,7 +2109,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements if (!canShowSecondaryHandle()) { resetSecondaryHandle(); } - mView.setShouldShowSwipeUpUi(mOverviewProxyService.shouldShowSwipeUpUI()); + mView.setShouldShowSwipeUpUi(mLauncherProxyService.shouldShowSwipeUpUI()); } }; diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarInflaterView.java index 96b730c08397..2c5a9c84645b 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarInflaterView.java @@ -41,7 +41,7 @@ import com.android.systemui.navigationbar.views.buttons.ButtonDispatcher; import com.android.systemui.navigationbar.views.buttons.KeyButtonView; import com.android.systemui.navigationbar.views.buttons.ReverseLinearLayout; import com.android.systemui.navigationbar.views.buttons.ReverseLinearLayout.ReverseRelativeLayout; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.res.R; import com.android.systemui.shared.system.QuickStepContract; @@ -117,13 +117,13 @@ public class NavigationBarInflaterView extends FrameLayout { private boolean mIsVertical; private boolean mAlternativeOrder; - private OverviewProxyService mOverviewProxyService; + private LauncherProxyService mLauncherProxyService; private int mNavBarMode = NAV_BAR_MODE_3BUTTON; public NavigationBarInflaterView(Context context, AttributeSet attrs) { super(context, attrs); createInflaters(); - mOverviewProxyService = Dependency.get(OverviewProxyService.class); + mLauncherProxyService = Dependency.get(LauncherProxyService.class); mListener = new Listener(this); mNavBarMode = Dependency.get(NavigationModeController.class).addListener(mListener); } @@ -159,7 +159,7 @@ public class NavigationBarInflaterView extends FrameLayout { protected String getDefaultLayout() { final int defaultResource = QuickStepContract.isGesturalMode(mNavBarMode) ? R.string.config_navBarLayoutHandle - : mOverviewProxyService.shouldShowSwipeUpUI() + : mLauncherProxyService.shouldShowSwipeUpUI() ? R.string.config_navBarLayoutQuickstep : R.string.config_navBarLayout; return getContext().getString(defaultResource); diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java index 38f2d42c8869..7815fb7c6919 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java @@ -180,7 +180,7 @@ public class NavigationBarView extends FrameLayout { */ private final boolean mImeCanRenderGesturalNavButtons = canImeRenderGesturalNavButtons(); private Gefingerpoken mTouchHandler; - private boolean mOverviewProxyEnabled; + private boolean mLauncherProxyEnabled; private boolean mShowSwipeUpUi; private UpdateActiveTouchRegionsCallback mUpdateActiveTouchRegionsCallback; @@ -644,7 +644,7 @@ public class NavigationBarView extends FrameLayout { // When screen pinning, don't hide back and home when connected service or back and // recents buttons when disconnected from launcher service in screen pinning mode, // as they are used for exiting. - if (mOverviewProxyEnabled) { + if (mLauncherProxyEnabled) { // Force disable recents when not in legacy mode disableRecent |= !QuickStepContract.isLegacyMode(mNavBarMode); if (mScreenPinningActive && !QuickStepContract.isGesturalMode(mNavBarMode)) { @@ -767,8 +767,8 @@ public class NavigationBarView extends FrameLayout { } } - void onOverviewProxyConnectionChange(boolean enabled) { - mOverviewProxyEnabled = enabled; + void onLauncherProxyConnectionChange(boolean enabled) { + mLauncherProxyEnabled = enabled; } void setShouldShowSwipeUpUi(boolean showSwipeUpUi) { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java index 111a2d43f881..32a03e5b10e9 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java @@ -61,7 +61,7 @@ import com.android.internal.logging.UiEventLoggerImpl; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.assist.AssistManager; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.res.R; import com.android.systemui.shared.navigationbar.KeyButtonRipple; import com.android.systemui.shared.system.QuickStepContract; @@ -82,7 +82,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { @VisibleForTesting boolean mLongClicked; private OnClickListener mOnClickListener; private final KeyButtonRipple mRipple; - private final OverviewProxyService mOverviewProxyService; + private final LauncherProxyService mLauncherProxyService; private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class); private final InputManagerGlobal mInputManagerGlobal; private final Paint mOvalBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); @@ -181,7 +181,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); mRipple = new KeyButtonRipple(context, this, R.dimen.key_button_ripple_max_width); - mOverviewProxyService = Dependency.get(OverviewProxyService.class); + mLauncherProxyService = Dependency.get(LauncherProxyService.class); mInputManagerGlobal = manager; setBackground(mRipple); setWillNotDraw(false); @@ -282,7 +282,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { @Override public boolean onTouchEvent(MotionEvent ev) { - final boolean showSwipeUI = mOverviewProxyService.shouldShowSwipeUpUI(); + final boolean showSwipeUI = mLauncherProxyService.shouldShowSwipeUpUI(); final int action = ev.getAction(); int x, y; if (action == MotionEvent.ACTION_DOWN) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/LauncherProxyService.java index 60c2cca1ae8b..9af4630bf492 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/LauncherProxyService.java @@ -100,14 +100,14 @@ import com.android.systemui.navigationbar.views.NavigationBar; import com.android.systemui.navigationbar.views.NavigationBarView; import com.android.systemui.navigationbar.views.buttons.KeyButtonView; import com.android.systemui.process.ProcessWrapper; -import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener; +import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener; import com.android.systemui.scene.domain.interactor.SceneInteractor; import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.ShadeViewController; import com.android.systemui.shade.domain.interactor.ShadeInteractor; -import com.android.systemui.shared.recents.IOverviewProxy; +import com.android.systemui.shared.recents.ILauncherProxy; import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; @@ -135,16 +135,16 @@ import javax.inject.Inject; import javax.inject.Provider; /** - * Class to send information from overview to launcher with a binder. + * Class to send information from SysUI to Launcher with a binder. */ @SysUISingleton -public class OverviewProxyService implements CallbackController<OverviewProxyListener>, +public class LauncherProxyService implements CallbackController<LauncherProxyListener>, NavigationModeController.ModeChangedListener, Dumpable { @VisibleForTesting static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE"; - public static final String TAG_OPS = "OverviewProxyService"; + public static final String TAG_OPS = "LauncherProxyService"; private static final long BACKOFF_MILLIS = 1000; private static final long DEFERRED_CALLBACK_MILLIS = 5000; // Max backoff caps at 5 mins @@ -165,7 +165,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private final Runnable mConnectionRunnable = () -> internalConnectToCurrentUser("runnable: startConnectionToCurrentUser"); private final ComponentName mRecentsComponentName; - private final List<OverviewProxyListener> mConnectionCallbacks = new ArrayList<>(); + private final List<LauncherProxyListener> mConnectionCallbacks = new ArrayList<>(); private final Intent mQuickStepIntent; private final ScreenshotHelper mScreenshotHelper; private final CommandQueue mCommandQueue; @@ -179,12 +179,12 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private final BroadcastDispatcher mBroadcastDispatcher; private final BackAnimation mBackAnimation; - private IOverviewProxy mOverviewProxy; + private ILauncherProxy mLauncherProxy; private int mConnectionBackoffAttempts; private boolean mBound; private boolean mIsEnabled; - // This is set to false when the overview service is requested to be bound until it is notified - // that the previous service has been cleaned up in IOverviewProxy#onUnbind(). It is also set to + // This is set to false when the launcher service is requested to be bound until it is notified + // that the previous service has been cleaned up in ILauncherProxy#onUnbind(). It is also set to // true after a 1000ms timeout by mDeferredBindAfterTimedOutCleanup. private boolean mIsPrevServiceCleanedUp = true; @@ -341,7 +341,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void updateContextualEduStats(boolean isTrackpadGesture, String gestureType) { verifyCallerAndClearCallingIdentityPostMain("updateContextualEduStats", - () -> mHandler.post(() -> OverviewProxyService.this.updateContextualEduStats( + () -> mHandler.post(() -> LauncherProxyService.this.updateContextualEduStats( isTrackpadGesture, GestureType.valueOf(gestureType)))); } @@ -504,7 +504,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void onReceive(Context context, Intent intent) { if (Objects.equals(intent.getAction(), Intent.ACTION_USER_UNLOCKED)) { if (keyguardPrivateNotifications()) { - // Start the overview connection to the launcher service + // Start the launcher connection to the launcher service // Connect if user hasn't connected yet if (getProxy() == null) { startConnectionToCurrentUser(); @@ -546,14 +546,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } }; - private final ServiceConnection mOverviewServiceConnection = new ServiceConnection() { + private final ServiceConnection mLauncherServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { - Log.d(TAG_OPS, "Overview proxy service connected"); + Log.d(TAG_OPS, "Launcher proxy service connected"); mConnectionBackoffAttempts = 0; mHandler.removeCallbacks(mDeferredConnectionCallback); try { - service.linkToDeath(mOverviewServiceDeathRcpt, 0); + service.linkToDeath(mLauncherServiceDeathRcpt, 0); } catch (RemoteException e) { // Failed to link to death (process may have died between binding and connecting), // just unbind the service for now and retry again @@ -564,7 +564,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } mCurrentBoundedUserId = mUserTracker.getUserId(); - mOverviewProxy = IOverviewProxy.Stub.asInterface(service); + mLauncherProxy = ILauncherProxy.Stub.asInterface(service); Bundle params = new Bundle(); addInterface(mSysUiProxy, params); @@ -574,8 +574,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis mShellInterface.createExternalInterfaces(params); try { - Log.d(TAG_OPS, "OverviewProxyService connected, initializing overview proxy"); - mOverviewProxy.onInitialize(params); + Log.d(TAG_OPS, "LauncherProxyService connected, initializing launcher proxy"); + mLauncherProxy.onInitialize(params); } catch (RemoteException e) { mCurrentBoundedUserId = -1; Log.e(TAG_OPS, "Failed to call onInitialize()", e); @@ -614,7 +614,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private final StatusBarWindowCallback mStatusBarWindowCallback = this::onStatusBarStateChanged; // This is the death handler for the binder from the launcher service - private final IBinder.DeathRecipient mOverviewServiceDeathRcpt + private final IBinder.DeathRecipient mLauncherServiceDeathRcpt = this::cleanupAfterDeath; private final IVoiceInteractionSessionListener mVoiceInteractionSessionListener = @@ -632,7 +632,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void onVoiceSessionWindowVisibilityChanged(boolean visible) { mContext.getMainExecutor().execute(() -> - OverviewProxyService.this.onVoiceSessionWindowVisibilityChanged(visible)); + LauncherProxyService.this.onVoiceSessionWindowVisibilityChanged(visible)); } @Override @@ -652,7 +652,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @SuppressWarnings("OptionalUsedAsFieldOrParameterType") @Inject - public OverviewProxyService(Context context, + public LauncherProxyService(Context context, @Main Executor mainExecutor, CommandQueue commandQueue, ShellInterface shellInterface, @@ -755,14 +755,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void moveFocusedTaskToStageSplit(int displayId, boolean leftOrTop) { - if (mOverviewProxy != null) { + if (mLauncherProxy != null) { try { if (DesktopModeStatus.canEnterDesktopMode(mContext) && (sysUiState.getFlags() & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0) { return; } - mOverviewProxy.enterStageSplitFromRunningApp(leftOrTop); + mLauncherProxy.enterStageSplitFromRunningApp(leftOrTop); } catch (RemoteException e) { Log.w(TAG_OPS, "Unable to enter stage split from the current running app"); } @@ -817,12 +817,12 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private void notifySystemUiStateFlags(@SystemUiStateFlags long flags) { if (SysUiState.DEBUG) { - Log.d(TAG_OPS, "Notifying sysui state change to overview service: proxy=" - + mOverviewProxy + " flags=" + flags); + Log.d(TAG_OPS, "Notifying sysui state change to launcher service: proxy=" + + mLauncherProxy + " flags=" + flags); } try { - if (mOverviewProxy != null) { - mOverviewProxy.onSystemUiStateChanged(flags); + if (mLauncherProxy != null) { + mLauncherProxy.onSystemUiStateChanged(flags); } } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to notify sysui state change", e); @@ -854,9 +854,9 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } private void dispatchNavButtonBounds() { - if (mOverviewProxy != null && mActiveNavBarRegion != null) { + if (mLauncherProxy != null && mActiveNavBarRegion != null) { try { - mOverviewProxy.onActiveNavBarRegionChanges(mActiveNavBarRegion); + mLauncherProxy.onActiveNavBarRegionChanges(mActiveNavBarRegion); } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to call onActiveNavBarRegionChanges()", e); } @@ -888,7 +888,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis // This should not happen, but if any per-user SysUI component has a dependency on OPS, // then this could get triggered Log.w(TAG_OPS, - "Skipping connection to overview service due to non-system foreground user " + "Skipping connection to launcher service due to non-system foreground user " + "caller"); return; } @@ -925,7 +925,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } try { mBound = mContext.bindServiceAsUser(mQuickStepIntent, - mOverviewServiceConnection, + mLauncherServiceConnection, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE, currentUser); } catch (SecurityException e) { @@ -954,15 +954,15 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } @Override - public void addCallback(@NonNull OverviewProxyListener listener) { + public void addCallback(@NonNull LauncherProxyListener listener) { if (!mConnectionCallbacks.contains(listener)) { mConnectionCallbacks.add(listener); } - listener.onConnectionChanged(mOverviewProxy != null); + listener.onConnectionChanged(mLauncherProxy != null); } @Override - public void removeCallback(@NonNull OverviewProxyListener listener) { + public void removeCallback(@NonNull LauncherProxyListener listener) { mConnectionCallbacks.remove(listener); } @@ -974,21 +974,21 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis return mIsEnabled; } - public IOverviewProxy getProxy() { - return mOverviewProxy; + public ILauncherProxy getProxy() { + return mLauncherProxy; } private void disconnectFromLauncherService(String disconnectReason) { Log.d(TAG_OPS, "disconnectFromLauncherService bound?: " + mBound + - " currentProxy: " + mOverviewProxy + " disconnectReason: " + disconnectReason, + " currentProxy: " + mLauncherProxy + " disconnectReason: " + disconnectReason, new Throwable()); if (mBound) { // Always unbind the service (ie. if called through onNullBinding or onBindingDied) - mContext.unbindService(mOverviewServiceConnection); + mContext.unbindService(mLauncherServiceConnection); mBound = false; - if (mOverviewProxy != null) { + if (mLauncherProxy != null) { try { - mOverviewProxy.onUnbind(new IRemoteCallback.Stub() { + mLauncherProxy.onUnbind(new IRemoteCallback.Stub() { @Override public void sendResult(Bundle data) throws RemoteException { // Received Launcher reply, try to bind anew. @@ -1006,9 +1006,9 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } } - if (mOverviewProxy != null) { - mOverviewProxy.asBinder().unlinkToDeath(mOverviewServiceDeathRcpt, 0); - mOverviewProxy = null; + if (mLauncherProxy != null) { + mLauncherProxy.asBinder().unlinkToDeath(mLauncherServiceDeathRcpt, 0); + mLauncherProxy = null; notifyConnectionChanged(); } } @@ -1044,7 +1044,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private void notifyConnectionChanged() { for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) { - mConnectionCallbacks.get(i).onConnectionChanged(mOverviewProxy != null); + mConnectionCallbacks.get(i).onConnectionChanged(mLauncherProxy != null); } } @@ -1095,10 +1095,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void notifyAssistantVisibilityChanged(float visibility) { try { - if (mOverviewProxy != null) { - mOverviewProxy.onAssistantVisibilityChanged(visibility); + if (mLauncherProxy != null) { + mLauncherProxy.onAssistantVisibilityChanged(visibility); } else { - Log.e(TAG_OPS, "Failed to get overview proxy for assistant visibility."); + Log.e(TAG_OPS, "Failed to get launcher proxy for assistant visibility."); } } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to call notifyAssistantVisibilityChanged()", e); @@ -1148,10 +1148,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void disable(int displayId, int state1, int state2, boolean animate) { try { - if (mOverviewProxy != null) { - mOverviewProxy.disable(displayId, state1, state2, animate); + if (mLauncherProxy != null) { + mLauncherProxy.disable(displayId, state1, state2, animate); } else { - Log.e(TAG_OPS, "Failed to get overview proxy for disable flags."); + Log.e(TAG_OPS, "Failed to get launcher proxy for disable flags."); } } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to call disable()", e); @@ -1160,10 +1160,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void onRotationProposal(int rotation, boolean isValid) { try { - if (mOverviewProxy != null) { - mOverviewProxy.onRotationProposal(rotation, isValid); + if (mLauncherProxy != null) { + mLauncherProxy.onRotationProposal(rotation, isValid); } else { - Log.e(TAG_OPS, "Failed to get overview proxy for proposing rotation."); + Log.e(TAG_OPS, "Failed to get launcher proxy for proposing rotation."); } } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to call onRotationProposal()", e); @@ -1172,10 +1172,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void onSystemBarAttributesChanged(int displayId, int behavior) { try { - if (mOverviewProxy != null) { - mOverviewProxy.onSystemBarAttributesChanged(displayId, behavior); + if (mLauncherProxy != null) { + mLauncherProxy.onSystemBarAttributesChanged(displayId, behavior); } else { - Log.e(TAG_OPS, "Failed to get overview proxy for system bar attr change."); + Log.e(TAG_OPS, "Failed to get launcher proxy for system bar attr change."); } } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to call onSystemBarAttributesChanged()", e); @@ -1184,10 +1184,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void onNavButtonsDarkIntensityChanged(float darkIntensity) { try { - if (mOverviewProxy != null) { - mOverviewProxy.onNavButtonsDarkIntensityChanged(darkIntensity); + if (mLauncherProxy != null) { + mLauncherProxy.onNavButtonsDarkIntensityChanged(darkIntensity); } else { - Log.e(TAG_OPS, "Failed to get overview proxy to update nav buttons dark intensity"); + Log.e(TAG_OPS, "Failed to get launcher proxy to update nav buttons dark intensity"); } } catch (RemoteException e) { Log.e(TAG_OPS, "Failed to call onNavButtonsDarkIntensityChanged()", e); @@ -1196,10 +1196,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public void onNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { try { - if (mOverviewProxy != null) { - mOverviewProxy.onNavigationBarLumaSamplingEnabled(displayId, enable); + if (mLauncherProxy != null) { + mLauncherProxy.onNavigationBarLumaSamplingEnabled(displayId, enable); } else { - Log.e(TAG_OPS, "Failed to get overview proxy to enable/disable nav bar luma" + Log.e(TAG_OPS, "Failed to get launcher proxy to enable/disable nav bar luma" + "sampling"); } } catch (RemoteException e) { @@ -1221,7 +1221,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void dump(PrintWriter pw, String[] args) { pw.println(TAG_OPS + " state:"); - pw.print(" isConnected="); pw.println(mOverviewProxy != null); + pw.print(" isConnected="); pw.println(mLauncherProxy != null); pw.print(" mIsEnabled="); pw.println(isEnabled()); pw.print(" mRecentsComponentName="); pw.println(mRecentsComponentName); pw.print(" mQuickStepIntent="); pw.println(mQuickStepIntent); @@ -1237,7 +1237,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis mSysUiState.dump(pw, args); } - public interface OverviewProxyListener { + public interface LauncherProxyListener { default void onConnectionChanged(boolean isConnected) {} default void onPrioritizedRotation(@Surface.Rotation int rotation) {} default void onOverviewShown(boolean fromHome) {} diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java index 21c5ae8aec40..e51b73dd96c6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java @@ -23,30 +23,30 @@ import android.util.Log; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.shared.recents.IOverviewProxy; +import com.android.systemui.shared.recents.ILauncherProxy; import com.android.systemui.statusbar.policy.KeyguardStateController; import javax.inject.Inject; /** - * An implementation of the Recents interface which proxies to the OverviewProxyService. + * An implementation of the Recents interface which proxies to the LauncherProxyService. */ @SysUISingleton public class OverviewProxyRecentsImpl implements RecentsImplementation { private final static String TAG = "OverviewProxyRecentsImpl"; private Handler mHandler; - private final OverviewProxyService mOverviewProxyService; + private final LauncherProxyService mLauncherProxyService; private final ActivityStarter mActivityStarter; private final KeyguardStateController mKeyguardStateController; @SuppressWarnings("OptionalUsedAsFieldOrParameterType") @Inject public OverviewProxyRecentsImpl( - OverviewProxyService overviewProxyService, + LauncherProxyService launcherProxyService, ActivityStarter activityStarter, KeyguardStateController keyguardStateController) { - mOverviewProxyService = overviewProxyService; + mLauncherProxyService = launcherProxyService; mActivityStarter = activityStarter; mKeyguardStateController = keyguardStateController; } @@ -58,10 +58,10 @@ public class OverviewProxyRecentsImpl implements RecentsImplementation { @Override public void showRecentApps(boolean triggeredFromAltTab) { - IOverviewProxy overviewProxy = mOverviewProxyService.getProxy(); - if (overviewProxy != null) { + ILauncherProxy launcherProxy = mLauncherProxyService.getProxy(); + if (launcherProxy != null) { try { - overviewProxy.onOverviewShown(triggeredFromAltTab); + launcherProxy.onOverviewShown(triggeredFromAltTab); } catch (RemoteException e) { Log.e(TAG, "Failed to send overview show event to launcher.", e); } @@ -70,10 +70,10 @@ public class OverviewProxyRecentsImpl implements RecentsImplementation { @Override public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { - IOverviewProxy overviewProxy = mOverviewProxyService.getProxy(); - if (overviewProxy != null) { + ILauncherProxy launcherProxy = mLauncherProxyService.getProxy(); + if (launcherProxy != null) { try { - overviewProxy.onOverviewHidden(triggeredFromAltTab, triggeredFromHomeKey); + launcherProxy.onOverviewHidden(triggeredFromAltTab, triggeredFromHomeKey); } catch (RemoteException e) { Log.e(TAG, "Failed to send overview hide event to launcher.", e); } @@ -83,13 +83,13 @@ public class OverviewProxyRecentsImpl implements RecentsImplementation { @Override public void toggleRecentApps() { // If connected to launcher service, let it handle the toggle logic - IOverviewProxy overviewProxy = mOverviewProxyService.getProxy(); - if (overviewProxy != null) { + ILauncherProxy launcherProxy = mLauncherProxyService.getProxy(); + if (launcherProxy != null) { final Runnable toggleRecents = () -> { try { - if (mOverviewProxyService.getProxy() != null) { - mOverviewProxyService.getProxy().onOverviewToggle(); - mOverviewProxyService.notifyToggleRecentApps(); + if (mLauncherProxyService.getProxy() != null) { + mLauncherProxyService.getProxy().onOverviewToggle(); + mLauncherProxyService.notifyToggleRecentApps(); } } catch (RemoteException e) { Log.e(TAG, "Cannot send toggle recents through proxy service.", e); diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt index 7299f092640f..cf310dd32613 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt @@ -34,8 +34,8 @@ import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.plugins.qs.QS import com.android.systemui.plugins.qs.QSContainerController -import com.android.systemui.recents.OverviewProxyService -import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener +import com.android.systemui.recents.LauncherProxyService +import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener import com.android.systemui.res.R import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shared.system.QuickStepContract @@ -57,7 +57,7 @@ class NotificationsQSContainerController constructor( view: NotificationsQuickSettingsContainer, private val navigationModeController: NavigationModeController, - private val overviewProxyService: OverviewProxyService, + private val launcherProxyService: LauncherProxyService, private val shadeHeaderController: ShadeHeaderController, private val shadeInteractor: ShadeInteractor, private val fragmentService: FragmentService, @@ -85,8 +85,8 @@ constructor( private var isGestureNavigation = true private var taskbarVisible = false - private val taskbarVisibilityListener: OverviewProxyListener = - object : OverviewProxyListener { + private val taskbarVisibilityListener: LauncherProxyListener = + object : LauncherProxyListener { override fun onTaskbarStatusUpdated(visible: Boolean, stashed: Boolean) { taskbarVisible = visible } @@ -134,7 +134,7 @@ constructor( public override fun onViewAttached() { updateResources() - overviewProxyService.addCallback(taskbarVisibilityListener) + launcherProxyService.addCallback(taskbarVisibilityListener) mView.setInsetsChangedListener(delayedInsetSetter) mView.setQSFragmentAttachedListener { qs: QS -> qs.setContainerController(this) } mView.setConfigurationChangedListener { updateResources() } @@ -142,7 +142,7 @@ constructor( } override fun onViewDetached() { - overviewProxyService.removeCallback(taskbarVisibilityListener) + launcherProxyService.removeCallback(taskbarVisibilityListener) mView.removeOnInsetsChangedListener() mView.removeQSFragmentAttachedListener() mView.setConfigurationChangedListener(null) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java index c8f972774ab0..382fc7058bf0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java @@ -70,7 +70,7 @@ import com.android.systemui.flags.FeatureFlagsClassic; import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -152,7 +152,7 @@ public class NotificationLockscreenUserManagerImpl implements private final List<UserChangedListener> mListeners = new ArrayList<>(); private final BroadcastDispatcher mBroadcastDispatcher; private final NotificationClickNotifier mClickNotifier; - private final Lazy<OverviewProxyService> mOverviewProxyServiceLazy; + private final Lazy<LauncherProxyService> mLauncherProxyServiceLazy; private final FeatureFlagsClassic mFeatureFlags; private boolean mShowLockscreenNotifications; private LockPatternUtils mLockPatternUtils; @@ -235,8 +235,8 @@ public class NotificationLockscreenUserManagerImpl implements if (!keyguardPrivateNotifications()) { // Start the overview connection to the launcher service // Connect if user hasn't connected yet - if (mOverviewProxyServiceLazy.get().getProxy() == null) { - mOverviewProxyServiceLazy.get().startConnectionToCurrentUser(); + if (mLauncherProxyServiceLazy.get().getProxy() == null) { + mLauncherProxyServiceLazy.get().startConnectionToCurrentUser(); } } } else if (Objects.equals(action, NOTIFICATION_UNLOCKED_BY_WORK_CHALLENGE_ACTION)) { @@ -318,7 +318,7 @@ public class NotificationLockscreenUserManagerImpl implements Lazy<NotificationVisibilityProvider> visibilityProviderLazy, Lazy<CommonNotifCollection> commonNotifCollectionLazy, NotificationClickNotifier clickNotifier, - Lazy<OverviewProxyService> overviewProxyServiceLazy, + Lazy<LauncherProxyService> launcherProxyServiceLazy, KeyguardManager keyguardManager, StatusBarStateController statusBarStateController, @Main Executor mainExecutor, @@ -343,7 +343,7 @@ public class NotificationLockscreenUserManagerImpl implements mVisibilityProviderLazy = visibilityProviderLazy; mCommonNotifCollectionLazy = commonNotifCollectionLazy; mClickNotifier = clickNotifier; - mOverviewProxyServiceLazy = overviewProxyServiceLazy; + mLauncherProxyServiceLazy = launcherProxyServiceLazy; statusBarStateController.addCallback(this); mLockPatternUtils = lockPatternUtils; mKeyguardManager = keyguardManager; diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java index 057ddcd54e68..8bfd2545ff2b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java @@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ import static com.android.systemui.accessibility.AccessibilityLogger.MagnificationSettingsEvent; import static com.android.systemui.accessibility.WindowMagnificationSettings.MagnificationSize; -import static com.android.systemui.recents.OverviewProxyService.OverviewProxyListener; +import static com.android.systemui.recents.LauncherProxyService.LauncherProxyListener; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP; import static org.mockito.ArgumentMatchers.any; @@ -53,7 +53,7 @@ import androidx.test.filters.SmallTest; import com.android.app.viewcapture.ViewCaptureAwareWindowManager; import com.android.systemui.SysuiTestCase; import com.android.systemui.model.SysUiState; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.util.settings.SecureSettings; @@ -80,13 +80,13 @@ public class MagnificationTest extends SysuiTestCase { @Mock private IMagnificationConnectionCallback mConnectionCallback; @Mock - private OverviewProxyService mOverviewProxyService; + private LauncherProxyService mLauncherProxyService; @Mock private SecureSettings mSecureSettings; private CommandQueue mCommandQueue; private MagnificationImpl mMagnification; - private OverviewProxyListener mOverviewProxyListener; + private LauncherProxyListener mLauncherProxyListener; private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Mock @@ -130,7 +130,7 @@ public class MagnificationTest extends SysuiTestCase { mMagnification = new MagnificationImpl(getContext(), getContext().getMainThreadHandler(), mContext.getMainExecutor(), mCommandQueue, mModeSwitchesController, - mSysUiState, mOverviewProxyService, mSecureSettings, mDisplayTracker, + mSysUiState, mLauncherProxyService, mSecureSettings, mDisplayTracker, getContext().getSystemService(DisplayManager.class), mA11yLogger, mIWindowManager, getContext().getSystemService(AccessibilityManager.class), mViewCaptureAwareWindowManager); @@ -140,10 +140,10 @@ public class MagnificationTest extends SysuiTestCase { mContext.getSystemService(DisplayManager.class), mMagnificationSettingsController); mMagnification.start(); - final ArgumentCaptor<OverviewProxyListener> listenerArgumentCaptor = - ArgumentCaptor.forClass(OverviewProxyListener.class); - verify(mOverviewProxyService).addCallback(listenerArgumentCaptor.capture()); - mOverviewProxyListener = listenerArgumentCaptor.getValue(); + final ArgumentCaptor<LauncherProxyListener> listenerArgumentCaptor = + ArgumentCaptor.forClass(LauncherProxyListener.class); + verify(mLauncherProxyService).addCallback(listenerArgumentCaptor.capture()); + mLauncherProxyListener = listenerArgumentCaptor.getValue(); } @Test @@ -336,7 +336,7 @@ public class MagnificationTest extends SysuiTestCase { @Test public void overviewProxyIsConnected_noController_resetFlag() { - mOverviewProxyListener.onConnectionChanged(true); + mLauncherProxyListener.onConnectionChanged(true); verify(mSysUiState).setFlag(SYSUI_STATE_MAGNIFICATION_OVERLAP, false); verify(mSysUiState).commitUpdate(mContext.getDisplayId()); @@ -349,7 +349,7 @@ public class MagnificationTest extends SysuiTestCase { mContext.getSystemService(DisplayManager.class), mController); mMagnification.mWindowMagnificationControllerSupplier.get(TEST_DISPLAY); - mOverviewProxyListener.onConnectionChanged(true); + mLauncherProxyListener.onConnectionChanged(true); verify(mController).updateSysUIStateFlag(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java index d59a404b15bb..0924df2538e1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java @@ -52,7 +52,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.kosmos.KosmosJavaAdapter; import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.views.NavigationBar; -import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.recents.LauncherProxyService; import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.shared.recents.utilities.Utilities; import com.android.systemui.shared.system.TaskStackChangeListeners; @@ -109,7 +109,7 @@ public class NavigationBarControllerImplTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); mNavigationBarController = spy( new NavigationBarControllerImpl(mContext, - mock(OverviewProxyService.class), + mock(LauncherProxyService.class), mock(NavigationModeController.class), mock(SysUiState.class), mCommandQueue, diff --git a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recents/LauncherProxyServiceTest.kt index 4e1ccfb07220..69b762b470b7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/recents/LauncherProxyServiceTest.kt @@ -40,11 +40,11 @@ import com.android.systemui.model.sceneContainerPlugin import com.android.systemui.navigationbar.NavigationBarController import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.process.ProcessWrapper -import com.android.systemui.recents.OverviewProxyService.ACTION_QUICKSTEP +import com.android.systemui.recents.LauncherProxyService.ACTION_QUICKSTEP import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.settings.UserTracker import com.android.systemui.shade.ShadeViewController -import com.android.systemui.shared.recents.IOverviewProxy +import com.android.systemui.shared.recents.ILauncherProxy import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK import com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_ASLEEP import com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_AWAKE @@ -83,12 +83,12 @@ import org.mockito.MockitoAnnotations @SmallTest @RunWith(AndroidJUnit4::class) @TestableLooper.RunWithLooper(setAsMainLooper = true) -class OverviewProxyServiceTest : SysuiTestCase() { +class LauncherProxyServiceTest : SysuiTestCase() { @Main private val executor: Executor = MoreExecutors.directExecutor() private val kosmos = testKosmos() - private lateinit var subject: OverviewProxyService + private lateinit var subject: LauncherProxyService @Mock private val dumpManager = DumpManager() @Mock private val processWrapper = ProcessWrapper() private val displayTracker = FakeDisplayTracker(mContext) @@ -97,10 +97,10 @@ class OverviewProxyServiceTest : SysuiTestCase() { private val wakefulnessLifecycle = WakefulnessLifecycle(mContext, null, fakeSystemClock, dumpManager) - @Mock private lateinit var overviewProxy: IOverviewProxy.Stub + @Mock private lateinit var launcherProxy: ILauncherProxy.Stub @Mock private lateinit var packageManager: PackageManager - // The following mocks belong to not-yet-tested parts of OverviewProxyService. + // The following mocks belong to not-yet-tested parts of LauncherProxyService. @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var shellInterface: ShellInterface @Mock private lateinit var navBarController: NavigationBarController @@ -127,18 +127,18 @@ class OverviewProxyServiceTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) val serviceComponent = ComponentName("test_package", "service_provider") - context.addMockService(serviceComponent, overviewProxy) + context.addMockService(serviceComponent, launcherProxy) context.addMockServiceResolver( TestableContext.MockServiceResolver { if (it.action == ACTION_QUICKSTEP) serviceComponent else null } ) - whenever(overviewProxy.queryLocalInterface(ArgumentMatchers.anyString())) - .thenReturn(overviewProxy) - whenever(overviewProxy.asBinder()).thenReturn(overviewProxy) + whenever(launcherProxy.queryLocalInterface(ArgumentMatchers.anyString())) + .thenReturn(launcherProxy) + whenever(launcherProxy.asBinder()).thenReturn(launcherProxy) // packageManager.resolveServiceAsUser has to return non-null for - // OverviewProxyService#isEnabled to become true. + // LauncherProxyService#isEnabled to become true. context.setMockPackageManager(packageManager) whenever(packageManager.resolveServiceAsUser(any(), anyInt(), anyInt())) .thenReturn(mock(ResolveInfo::class.java)) @@ -147,7 +147,7 @@ class OverviewProxyServiceTest : SysuiTestCase() { // return isSystemUser as true by default. `when`(processWrapper.isSystemUser).thenReturn(true) - subject = createOverviewProxyService(context) + subject = createLauncherProxyService(context) } @After @@ -159,11 +159,11 @@ class OverviewProxyServiceTest : SysuiTestCase() { fun wakefulnessLifecycle_dispatchFinishedWakingUpSetsSysUIflagToAWAKE() { // WakefulnessLifecycle is initialized to AWAKE initially, and won't emit a noop. wakefulnessLifecycle.dispatchFinishedGoingToSleep() - clearInvocations(overviewProxy) + clearInvocations(launcherProxy) wakefulnessLifecycle.dispatchFinishedWakingUp() - verify(overviewProxy) + verify(launcherProxy) .onSystemUiStateChanged( longThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_AWAKE } ) @@ -173,7 +173,7 @@ class OverviewProxyServiceTest : SysuiTestCase() { fun wakefulnessLifecycle_dispatchStartedWakingUpSetsSysUIflagToWAKING() { wakefulnessLifecycle.dispatchStartedWakingUp(PowerManager.WAKE_REASON_UNKNOWN) - verify(overviewProxy) + verify(launcherProxy) .onSystemUiStateChanged( longThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_WAKING } ) @@ -183,7 +183,7 @@ class OverviewProxyServiceTest : SysuiTestCase() { fun wakefulnessLifecycle_dispatchFinishedGoingToSleepSetsSysUIflagToASLEEP() { wakefulnessLifecycle.dispatchFinishedGoingToSleep() - verify(overviewProxy) + verify(launcherProxy) .onSystemUiStateChanged( longThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_ASLEEP } ) @@ -195,56 +195,56 @@ class OverviewProxyServiceTest : SysuiTestCase() { PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON ) - verify(overviewProxy) + verify(launcherProxy) .onSystemUiStateChanged( longThat { it and SYSUI_STATE_WAKEFULNESS_MASK == WAKEFULNESS_GOING_TO_SLEEP } ) } @Test - fun connectToOverviewService_primaryUserNoVisibleBgUsersSupported_expectBindService() { + fun connectToLauncherService_primaryUserNoVisibleBgUsersSupported_expectBindService() { `when`(processWrapper.isSystemUser).thenReturn(true) `when`(userManager.isVisibleBackgroundUsersSupported()).thenReturn(false) val spyContext = spy(context) - val ops = createOverviewProxyService(spyContext) + val ops = createLauncherProxyService(spyContext) ops.startConnectionToCurrentUser() verify(spyContext, atLeast(1)).bindServiceAsUser(any(), any(), anyInt(), any()) } @Test - fun connectToOverviewService_nonPrimaryUserNoVisibleBgUsersSupported_expectNoBindService() { + fun connectToLauncherService_nonPrimaryUserNoVisibleBgUsersSupported_expectNoBindService() { `when`(processWrapper.isSystemUser).thenReturn(false) `when`(userManager.isVisibleBackgroundUsersSupported()).thenReturn(false) val spyContext = spy(context) - val ops = createOverviewProxyService(spyContext) + val ops = createLauncherProxyService(spyContext) ops.startConnectionToCurrentUser() verify(spyContext, times(0)).bindServiceAsUser(any(), any(), anyInt(), any()) } @Test - fun connectToOverviewService_nonPrimaryBgUserVisibleBgUsersSupported_expectBindService() { + fun connectToLauncherService_nonPrimaryBgUserVisibleBgUsersSupported_expectBindService() { `when`(processWrapper.isSystemUser).thenReturn(false) `when`(userManager.isVisibleBackgroundUsersSupported()).thenReturn(true) `when`(userManager.isUserForeground()).thenReturn(false) val spyContext = spy(context) - val ops = createOverviewProxyService(spyContext) + val ops = createLauncherProxyService(spyContext) ops.startConnectionToCurrentUser() verify(spyContext, atLeast(1)).bindServiceAsUser(any(), any(), anyInt(), any()) } @Test - fun connectToOverviewService_nonPrimaryFgUserVisibleBgUsersSupported_expectNoBindService() { + fun connectToLauncherService_nonPrimaryFgUserVisibleBgUsersSupported_expectNoBindService() { `when`(processWrapper.isSystemUser).thenReturn(false) `when`(userManager.isVisibleBackgroundUsersSupported()).thenReturn(true) `when`(userManager.isUserForeground()).thenReturn(true) val spyContext = spy(context) - val ops = createOverviewProxyService(spyContext) + val ops = createLauncherProxyService(spyContext) ops.startConnectionToCurrentUser() verify(spyContext, times(0)).bindServiceAsUser(any(), any(), anyInt(), any()) } - private fun createOverviewProxyService(ctx: Context): OverviewProxyService { - return OverviewProxyService( + private fun createLauncherProxyService(ctx: Context): LauncherProxyService { + return LauncherProxyService( ctx, executor, commandQueue, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt index a04ca038021e..9abe9aa5e598 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt @@ -32,8 +32,8 @@ import com.android.systemui.fragments.FragmentService import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener import com.android.systemui.plugins.qs.QS -import com.android.systemui.recents.OverviewProxyService -import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener +import com.android.systemui.recents.LauncherProxyService +import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener import com.android.systemui.res.R import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController @@ -71,7 +71,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { private val view = mock<NotificationsQuickSettingsContainer>() private val navigationModeController = mock<NavigationModeController>() - private val overviewProxyService = mock<OverviewProxyService>() + private val mLauncherProxyService = mock<LauncherProxyService>() private val shadeHeaderController = mock<ShadeHeaderController>() private val shadeInteractor = mock<ShadeInteractor>() private val fragmentService = mock<FragmentService>() @@ -81,7 +81,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { private val largeScreenHeaderHelper = mock<LargeScreenHeaderHelper>() @Captor lateinit var navigationModeCaptor: ArgumentCaptor<ModeChangedListener> - @Captor lateinit var taskbarVisibilityCaptor: ArgumentCaptor<OverviewProxyListener> + @Captor lateinit var taskbarVisibilityCaptor: ArgumentCaptor<LauncherProxyListener> @Captor lateinit var windowInsetsCallbackCaptor: ArgumentCaptor<Consumer<WindowInsets>> @Captor lateinit var constraintSetCaptor: ArgumentCaptor<ConstraintSet> @Captor lateinit var attachStateListenerCaptor: ArgumentCaptor<View.OnAttachStateChangeListener> @@ -89,7 +89,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { lateinit var underTest: NotificationsQSContainerController private lateinit var navigationModeCallback: ModeChangedListener - private lateinit var taskbarVisibilityCallback: OverviewProxyListener + private lateinit var taskbarVisibilityCallback: LauncherProxyListener private lateinit var windowInsetsCallback: Consumer<WindowInsets> private lateinit var fakeSystemClock: FakeSystemClock private lateinit var delayableExecutor: FakeExecutor @@ -110,7 +110,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { NotificationsQSContainerController( view, navigationModeController, - overviewProxyService, + mLauncherProxyService, shadeHeaderController, shadeInteractor, fragmentService, @@ -127,7 +127,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { overrideResource(R.dimen.qs_footer_action_inset, FOOTER_ACTIONS_INSET) whenever(navigationModeController.addListener(navigationModeCaptor.capture())) .thenReturn(GESTURES_NAVIGATION) - doNothing().`when`(overviewProxyService).addCallback(taskbarVisibilityCaptor.capture()) + doNothing().`when`(mLauncherProxyService).addCallback(taskbarVisibilityCaptor.capture()) doNothing().`when`(view).setInsetsChangedListener(windowInsetsCallbackCaptor.capture()) doNothing().`when`(view).applyConstraints(constraintSetCaptor.capture()) doNothing().`when`(view).addOnAttachStateChangeListener(attachStateListenerCaptor.capture()) @@ -402,7 +402,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { NotificationsQSContainerController( container, navigationModeController, - overviewProxyService, + mLauncherProxyService, shadeHeaderController, shadeInteractor, fragmentService, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt index 24f8843e935d..4c12cc886e33 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt @@ -32,8 +32,8 @@ import com.android.systemui.fragments.FragmentService import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener import com.android.systemui.plugins.qs.QS -import com.android.systemui.recents.OverviewProxyService -import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener +import com.android.systemui.recents.LauncherProxyService +import com.android.systemui.recents.LauncherProxyService.LauncherProxyListener import com.android.systemui.res.R import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController @@ -70,7 +70,7 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { private val view = mock<NotificationsQuickSettingsContainer>() private val navigationModeController = mock<NavigationModeController>() - private val overviewProxyService = mock<OverviewProxyService>() + private val mLauncherProxyService = mock<LauncherProxyService>() private val shadeHeaderController = mock<ShadeHeaderController>() private val shadeInteractor = mock<ShadeInteractor>() private val fragmentService = mock<FragmentService>() @@ -80,7 +80,7 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { private val largeScreenHeaderHelper = mock<LargeScreenHeaderHelper>() @Captor lateinit var navigationModeCaptor: ArgumentCaptor<ModeChangedListener> - @Captor lateinit var taskbarVisibilityCaptor: ArgumentCaptor<OverviewProxyListener> + @Captor lateinit var taskbarVisibilityCaptor: ArgumentCaptor<LauncherProxyListener> @Captor lateinit var windowInsetsCallbackCaptor: ArgumentCaptor<Consumer<WindowInsets>> @Captor lateinit var constraintSetCaptor: ArgumentCaptor<ConstraintSet> @Captor lateinit var attachStateListenerCaptor: ArgumentCaptor<View.OnAttachStateChangeListener> @@ -88,7 +88,7 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { lateinit var underTest: NotificationsQSContainerController private lateinit var navigationModeCallback: ModeChangedListener - private lateinit var taskbarVisibilityCallback: OverviewProxyListener + private lateinit var taskbarVisibilityCallback: LauncherProxyListener private lateinit var windowInsetsCallback: Consumer<WindowInsets> private lateinit var fakeSystemClock: FakeSystemClock private lateinit var delayableExecutor: FakeExecutor @@ -110,7 +110,7 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { NotificationsQSContainerController( view, navigationModeController, - overviewProxyService, + mLauncherProxyService, shadeHeaderController, shadeInteractor, fragmentService, @@ -127,7 +127,7 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { overrideResource(R.dimen.qs_footer_action_inset, FOOTER_ACTIONS_INSET) whenever(navigationModeController.addListener(navigationModeCaptor.capture())) .thenReturn(GESTURES_NAVIGATION) - doNothing().`when`(overviewProxyService).addCallback(taskbarVisibilityCaptor.capture()) + doNothing().`when`(mLauncherProxyService).addCallback(taskbarVisibilityCaptor.capture()) doNothing().`when`(view).setInsetsChangedListener(windowInsetsCallbackCaptor.capture()) doNothing().`when`(view).applyConstraints(constraintSetCaptor.capture()) doNothing().`when`(view).addOnAttachStateChangeListener(attachStateListenerCaptor.capture()) @@ -457,7 +457,7 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { NotificationsQSContainerController( container, navigationModeController, - overviewProxyService, + mLauncherProxyService, shadeHeaderController, shadeInteractor, fragmentService, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt index 93e7f2e588b0..83f4e8f5aa49 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt @@ -25,7 +25,7 @@ import com.android.systemui.keyboard.data.repository.keyboardRepository import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testDispatcher import com.android.systemui.kosmos.testScope -import com.android.systemui.recents.OverviewProxyService +import com.android.systemui.recents.LauncherProxyService import com.android.systemui.touchpad.data.repository.touchpadRepository import com.android.systemui.user.data.repository.userRepository import org.mockito.kotlin.mock @@ -43,12 +43,12 @@ var Kosmos.keyboardTouchpadEduInteractor by userRepository, ), tutorialRepository = tutorialSchedulerRepository, - overviewProxyService = mockOverviewProxyService, + launcherProxyService = mockLauncherProxyService, metricsLogger = mockEduMetricsLogger, clock = fakeEduClock, ) } var Kosmos.mockEduMetricsLogger by Kosmos.Fixture { mock<ContextualEducationMetricsLogger>() } -var Kosmos.mockOverviewProxyService by Kosmos.Fixture { mock<OverviewProxyService>() } +var Kosmos.mockLauncherProxyService by Kosmos.Fixture { mock<LauncherProxyService>() } var Kosmos.mockEduInputManager by Kosmos.Fixture { mock<InputManager>() } |