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

Commit 8c30fbae authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Fix drag and drop (3/3)"

parents 9a788837 6262f224

services/core/java/com/android/server/input/InputManagerService.java

+0 −25
Original line number Diff line number Diff line
@@ -213,8 +213,6 @@ public class InputManagerService extends IInputManager.Stub 
    private static native void nativeSetFocusedApplication(long ptr,

            int displayId, InputApplicationHandle application);

    private static native void nativeSetFocusedDisplay(long ptr, int displayId);

    private static native boolean nativeTransferTouchFocus(long ptr,

            InputChannel fromChannel, InputChannel toChannel);

    private static native void nativeSetPointerSpeed(long ptr, int speed);

    private static native void nativeSetShowTouches(long ptr, boolean enabled);

    private static native void nativeSetInteractive(long ptr, boolean interactive);
@@ -1485,29 +1483,6 @@ public class InputManagerService extends IInputManager.Stub 
        nativeSetSystemUiVisibility(mPtr, visibility);

    }



    /**

     * Atomically transfers touch focus from one window to another as identified by

     * their input channels.  It is possible for multiple windows to have

     * touch focus if they support split touch dispatch

     * {@link android.view.WindowManager.LayoutParams#FLAG_SPLIT_TOUCH} but this

     * method only transfers touch focus of the specified window without affecting

     * other windows that may also have touch focus at the same time.

     * @param fromChannel The channel of a window that currently has touch focus.

     * @param toChannel The channel of the window that should receive touch focus in

     * place of the first.

     * @return True if the transfer was successful.  False if the window with the

     * specified channel did not actually have touch focus at the time of the request.

     */

    public boolean transferTouchFocus(InputChannel fromChannel, InputChannel toChannel) {

        if (fromChannel == null) {

            throw new IllegalArgumentException("fromChannel must not be null.");

        }

        if (toChannel == null) {

            throw new IllegalArgumentException("toChannel must not be null.");

        }

        return nativeTransferTouchFocus(mPtr, fromChannel, toChannel);

    }



    @Override // Binder call

    public void tryPointerSpeed(int speed) {

        if (!checkCallingPermission(android.Manifest.permission.SET_POINTER_SPEED,

services/core/jni/com_android_server_input_InputManagerService.cpp

+0 −23
Original line number Diff line number Diff line
@@ -1500,27 +1500,6 @@ static void nativeSetSystemUiVisibility(JNIEnv* /* env */, 
    im->setSystemUiVisibility(visibility);

}



static jboolean nativeTransferTouchFocus(JNIEnv* env,

        jclass /* clazz */, jlong ptr, jobject fromChannelObj, jobject toChannelObj) {

    NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);



    sp<InputChannel> fromChannel =

            android_view_InputChannel_getInputChannel(env, fromChannelObj);

    sp<InputChannel> toChannel =

            android_view_InputChannel_getInputChannel(env, toChannelObj);



    if (fromChannel == nullptr || toChannel == nullptr) {

        return JNI_FALSE;

    }



    if (im->getInputManager()->getDispatcher()->

            transferTouchFocus(fromChannel, toChannel)) {

        return JNI_TRUE;

    } else {

        return JNI_FALSE;

    }

}



static void nativeSetPointerSpeed(JNIEnv* /* env */,

        jclass /* clazz */, jlong ptr, jint speed) {

    NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
@@ -1708,8 +1687,6 @@ static const JNINativeMethod gInputManagerMethods[] = { 
            (void*) nativeSetInputDispatchMode },

    { "nativeSetSystemUiVisibility", "(JI)V",

            (void*) nativeSetSystemUiVisibility },

    { "nativeTransferTouchFocus", "(JLandroid/view/InputChannel;Landroid/view/InputChannel;)Z",

            (void*) nativeTransferTouchFocus },

    { "nativeSetPointerSpeed", "(JI)V",

            (void*) nativeSetPointerSpeed },

    { "nativeSetShowTouches", "(JZ)V",

services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java

+0 −4
Original line number Diff line number Diff line
@@ -20,11 +20,9 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.any;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;



import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;
@@ -125,7 +123,6 @@ public class DragDropControllerTests extends WindowTestsBase { 
        mDisplayContent = spy(mDisplayContent);

        mWindow = createDropTargetWindow("Drag test window", 0);

        doReturn(mWindow).when(mDisplayContent).getTouchableWinAtPointLocked(0, 0);

        when(mWm.mInputManager.transferTouchFocus(any(), any())).thenReturn(true);



        synchronized (mWm.mGlobalLock) {

            mWm.mWindowMap.put(mWindow.mClient.asBinder(), mWindow);
@@ -176,7 +173,6 @@ public class DragDropControllerTests extends WindowTestsBase { 
                    .setFormat(PixelFormat.TRANSLUCENT)

                    .build();



            assertTrue(mWm.mInputManager.transferTouchFocus(null, null));

            mToken = mTarget.performDrag(

                    new SurfaceSession(), 0, 0, mWindow.mClient, flag, surface, 0, 0, 0, 0, 0,

                    data);

services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java

+0 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm; 


import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.any;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;
@@ -58,10 +57,6 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 
        assertNotNull(mWm.mTaskPositioningController);

        mTarget = mWm.mTaskPositioningController;



        when(mWm.mInputManager.transferTouchFocus(

                any(InputChannel.class),

                any(InputChannel.class))).thenReturn(true);



        mWindow = createWindow(null, TYPE_BASE_APPLICATION, "window");

        mWindow.mInputChannel = new InputChannel();

        synchronized (mWm.mGlobalLock) {