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

Commit bf8bdcc7 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Rename OverviewProxyService to LauncherProxyService" into main

parents 1419dbfa af073144

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

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

+4 −4
Original line number Diff line number Diff line
@@ -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)

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -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()

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

+4 −4
Original line number Diff line number Diff line
@@ -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());

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -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,