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

Commit 99190ad6 authored by Asmita Poddar's avatar Asmita Poddar Committed by Automerger Merge Worker
Browse files

Merge "Replace InputManager.getInstance() with getSystemService() from... 

Merge "Replace InputManager.getInstance() with getSystemService() from context" into udc-dev am: 4400f5d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21536691



Change-Id: Id029e3b821275864465c85ade65d0f790fbe6011
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08c957fa 4400f5d7

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
                InputDevice.SOURCE_KEYBOARD);



        ev.setDisplayId(mContext.getDisplay().getDisplayId());

        if (!InputManager.getInstance()

        if (!mContext.getSystemService(InputManager.class)

                .injectInputEvent(ev, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC)) {

            Log.e(TAG, "Inject input event fail");

        }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblesNavBarGestureTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ class BubblesNavBarGestureTracker { 


        stopInternal();



        mInputMonitor = InputManager.getInstance().monitorGestureInput(GESTURE_MONITOR,

                mContext.getDisplayId());

        mInputMonitor = mContext.getSystemService(InputManager.class)

                .monitorGestureInput(GESTURE_MONITOR, mContext.getDisplayId());

        InputChannel inputChannel = mInputMonitor.getInputChannel();



        BubblesNavBarMotionEventHandler motionEventHandler =

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ public class PipResizeGestureHandler { 


        if (mIsEnabled) {

            // Register input event receiver

            mInputMonitor = InputManager.getInstance().monitorGestureInput(

            mInputMonitor = mContext.getSystemService(InputManager.class).monitorGestureInput(

                    "pip-resize", mDisplayId);

            try {

                mMainExecutor.executeBlocking(() -> {

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
    }



    private void createInputChannel(int displayId) {

        final InputManager inputManager = InputManager.getInstance();

        final InputManager inputManager = mContext.getSystemService(InputManager.class);

        final InputMonitor inputMonitor =

                mInputMonitorFactory.create(inputManager, mContext);

        final EventReceiver eventReceiver = new EventReceiver(inputMonitor,

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskOperations.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class TaskOperations { 
                InputDevice.SOURCE_KEYBOARD);



        ev.setDisplayId(mContext.getDisplay().getDisplayId());

        if (!InputManager.getInstance()

        if (!mContext.getSystemService(InputManager.class)

                .injectInputEvent(ev, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC)) {

            Log.e(TAG, "Inject input event fail");

        }