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

Commit 1684cdbe authored by Bryce Lee's avatar Bryce Lee
Browse files

Rename Touch classes. 

This generalizes the names of touch related classes that were
originally only for dreams.

Flag: NA
Test: atest TouchMonitorTest
Bug: 333885071
Change-Id: Id34da5750d8cde8b855d78819fed8c625b780432
parent c9a551fe

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import com.android.systemui.complication.ComplicationLayoutEngine; 
import com.android.systemui.dreams.complication.HideComplicationTouchHandler;

import com.android.systemui.dreams.complication.dagger.ComplicationComponent;

import com.android.systemui.dreams.dagger.DreamOverlayComponent;

import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor;

import com.android.systemui.dreams.touch.TouchMonitor;

import com.android.systemui.touch.TouchInsetManager;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.time.FakeSystemClock;
@@ -143,7 +143,7 @@ public class DreamOverlayServiceTest extends SysuiTestCase { 
    KeyguardUpdateMonitor mKeyguardUpdateMonitor;



    @Mock

    DreamOverlayTouchMonitor mDreamOverlayTouchMonitor;

    TouchMonitor mTouchMonitor;



    @Mock

    DreamOverlayStateController mStateController;
@@ -187,8 +187,8 @@ public class DreamOverlayServiceTest extends SysuiTestCase { 
                .create(any(), any(), any()))

                .thenReturn(mDreamOverlayComponent);

        when(mAmbientTouchComponentFactory.create(any(), any())).thenReturn(mAmbientTouchComponent);

        when(mAmbientTouchComponent.getDreamOverlayTouchMonitor())

                .thenReturn(mDreamOverlayTouchMonitor);

        when(mAmbientTouchComponent.getTouchMonitor())

                .thenReturn(mTouchMonitor);

        when(mDreamOverlayContainerViewController.getContainerView())

                .thenReturn(mDreamOverlayContainerView);
@@ -515,7 +515,7 @@ public class DreamOverlayServiceTest extends SysuiTestCase { 
        // Verify that new instances of overlay container view controller and overlay touch monitor

        // are created.

        verify(mDreamOverlayComponent).getDreamOverlayContainerViewController();

        verify(mAmbientTouchComponent).getDreamOverlayTouchMonitor();

        verify(mAmbientTouchComponent).getTouchMonitor();

    }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/complication/HideComplicationTouchHandlerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import androidx.test.filters.SmallTest; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.complication.Complication;

import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.dreams.touch.DreamTouchHandler;

import com.android.systemui.dreams.touch.TouchHandler;

import com.android.systemui.shared.system.InputChannelCompat;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.touch.TouchInsetManager;
@@ -74,7 +74,7 @@ public class HideComplicationTouchHandlerTest extends SysuiTestCase { 
    MotionEvent mMotionEvent;



    @Mock

    DreamTouchHandler.TouchSession mSession;

    TouchHandler.TouchSession mSession;



    @Mock

    DreamOverlayStateController mStateController;

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    FlingAnimationUtils mFlingAnimationUtilsClosing;



    @Mock

    DreamTouchHandler.TouchSession mTouchSession;

    TouchHandler.TouchSession mTouchSession;



    BouncerSwipeTouchHandler mTouchHandler;
@@ -258,7 +258,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    }



    private static void onSessionStartHelper(BouncerSwipeTouchHandler touchHandler,

            DreamTouchHandler.TouchSession touchSession,

            TouchHandler.TouchSession touchSession,

            NotificationShadeWindowController notificationShadeWindowController) {

        touchHandler.onSessionStart(touchSession);

        verify(notificationShadeWindowController).setForcePluginOpen(eq(true), any());
@@ -677,8 +677,8 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    @Test

    public void testTouchSessionOnRemovedCalledTwice() {

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<DreamTouchHandler.TouchSession.Callback> onRemovedCallbackCaptor =

                ArgumentCaptor.forClass(DreamTouchHandler.TouchSession.Callback.class);

        ArgumentCaptor<TouchHandler.TouchSession.Callback> onRemovedCallbackCaptor =

                ArgumentCaptor.forClass(TouchHandler.TouchSession.Callback.class);

        verify(mTouchSession).registerCallback(onRemovedCallbackCaptor.capture());

        onRemovedCallbackCaptor.getValue().onRemoved();

        onRemovedCallbackCaptor.getValue().onRemoved();

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/CommunalTouchHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class CommunalTouchHandlerTest extends SysuiTestCase { 
    @Mock

    CentralSurfaces mCentralSurfaces;

    @Mock

    DreamTouchHandler.TouchSession mTouchSession;

    TouchHandler.TouchSession mTouchSession;

    CommunalTouchHandler mTouchHandler;

    @Mock

    Lifecycle mLifecycle;

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/ShadeTouchHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class ShadeTouchHandlerTest extends SysuiTestCase { 
    ShadeViewController mShadeViewController;



    @Mock

    DreamTouchHandler.TouchSession mTouchSession;

    TouchHandler.TouchSession mTouchSession;



    ShadeTouchHandler mTouchHandler;