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

Commit ffce2a9e authored by Jason Chang's avatar Jason Chang Committed by Winson Chung
Browse files

Remove unused OverlayManager injected instance and 

InteractionJankMonitor from One-handed mode

Removed unused IOverlayManager and InteractionJankMonitor from
OneHandedController.java & OneHandedControllerTest.java

Bug: 236354496

Test: local build passed
Test: atest WMShellUnitTests
Change-Id: I13d6ab3b69840e54edc40f765b28ce12ca5fa3a2
Merged-In: I13d6ab3b69840e54edc40f765b28ce12ca5fa3a2
(cherry picked from commit dc4c0457)
parent b7de9166

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

+1 −9
Original line number Diff line number Diff line
@@ -28,12 +28,10 @@ import static com.android.wm.shell.onehanded.OneHandedState.STATE_NONE; 
import android.annotation.BinderThread;

import android.content.ComponentName;

import android.content.Context;

import android.content.om.IOverlayManager;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.Rect;

import android.os.Handler;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Slog;
@@ -92,7 +90,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>, 
    private final OneHandedState mState;

    private final OneHandedTutorialHandler mTutorialHandler;

    private final TaskStackListenerImpl mTaskStackListener;

    private final IOverlayManager mOverlayManager;

    private final ShellExecutor mMainExecutor;

    private final Handler mMainHandler;

    private final OneHandedImpl mImpl = new OneHandedImpl();
@@ -210,11 +207,9 @@ public class OneHandedController implements RemoteCallable<OneHandedController>, 
                context, displayLayout, settingsUtil, animationController, tutorialHandler,

                jankMonitor, mainExecutor);

        OneHandedUiEventLogger oneHandedUiEventsLogger = new OneHandedUiEventLogger(uiEventLogger);

        IOverlayManager overlayManager = IOverlayManager.Stub.asInterface(

                ServiceManager.getService(Context.OVERLAY_SERVICE));

        return new OneHandedController(context, displayController, organizer, touchHandler,

                tutorialHandler, settingsUtil, accessibilityUtil, timeoutHandler, oneHandedState,

                jankMonitor, oneHandedUiEventsLogger, overlayManager, taskStackListener,

                oneHandedUiEventsLogger, taskStackListener,

                mainExecutor, mainHandler);

    }
@@ -228,9 +223,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController>, 
            OneHandedAccessibilityUtil oneHandedAccessibilityUtil,

            OneHandedTimeoutHandler timeoutHandler,

            OneHandedState state,

            InteractionJankMonitor jankMonitor,

            OneHandedUiEventLogger uiEventsLogger,

            IOverlayManager overlayManager,

            TaskStackListenerImpl taskStackListener,

            ShellExecutor mainExecutor,

            Handler mainHandler) {
@@ -242,7 +235,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>, 
        mTouchHandler = touchHandler;

        mState = state;

        mTutorialHandler = tutorialHandler;

        mOverlayManager = overlayManager;

        mMainExecutor = mainExecutor;

        mMainHandler = mainHandler;

        mOneHandedUiEventLogger = uiEventsLogger;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java

+0 −11
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.om.IOverlayManager;

import android.graphics.Rect;

import android.os.Handler;

import android.os.UserHandle;
@@ -41,12 +40,10 @@ import android.testing.AndroidTestingRunner; 
import android.util.ArrayMap;

import android.view.Display;

import android.view.Surface;

import android.view.SurfaceControl;

import android.window.WindowContainerTransaction;



import androidx.test.filters.SmallTest;



import com.android.internal.jank.InteractionJankMonitor;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.ShellExecutor;
@@ -87,16 +84,10 @@ public class OneHandedControllerTest extends OneHandedTestCase { 
    @Mock

    OneHandedUiEventLogger mMockUiEventLogger;

    @Mock

    InteractionJankMonitor mMockJankMonitor;

    @Mock

    IOverlayManager mMockOverlayManager;

    @Mock

    TaskStackListenerImpl mMockTaskStackListener;

    @Mock

    ShellExecutor mMockShellMainExecutor;

    @Mock

    SurfaceControl mMockLeash;

    @Mock

    Handler mMockShellMainHandler;



    final boolean mDefaultEnabled = true;
@@ -140,9 +131,7 @@ public class OneHandedControllerTest extends OneHandedTestCase { 
                mOneHandedAccessibilityUtil,

                mSpiedTimeoutHandler,

                mSpiedTransitionState,

                mMockJankMonitor,

                mMockUiEventLogger,

                mMockOverlayManager,

                mMockTaskStackListener,

                mMockShellMainExecutor,

                mMockShellMainHandler)

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedStateTest.java

+0 −11
Original line number Diff line number Diff line
@@ -29,18 +29,15 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.om.IOverlayManager;

import android.graphics.Rect;

import android.os.Handler;

import android.os.UserHandle;

import android.testing.AndroidTestingRunner;

import android.util.ArrayMap;

import android.view.Display;

import android.view.SurfaceControl;



import androidx.test.filters.SmallTest;



import com.android.internal.jank.InteractionJankMonitor;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.ShellExecutor;
@@ -77,16 +74,10 @@ public class OneHandedStateTest extends OneHandedTestCase { 
    @Mock

    OneHandedUiEventLogger mMockUiEventLogger;

    @Mock

    InteractionJankMonitor mMockJankMonitor;

    @Mock

    IOverlayManager mMockOverlayManager;

    @Mock

    TaskStackListenerImpl mMockTaskStackListener;

    @Mock

    ShellExecutor mMockShellMainExecutor;

    @Mock

    SurfaceControl mMockLeash;

    @Mock

    Handler mMockShellMainHandler;



    final boolean mDefaultEnabled = true;
@@ -127,9 +118,7 @@ public class OneHandedStateTest extends OneHandedTestCase { 
                mOneHandedAccessibilityUtil,

                mSpiedTimeoutHandler,

                mSpiedState,

                mMockJankMonitor,

                mMockUiEventLogger,

                mMockOverlayManager,

                mMockTaskStackListener,

                mMockShellMainExecutor,

                mMockShellMainHandler)