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

Commit e007f08c authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rm-choreographer-flag" into main 

* changes:
  WM mouse pointer tracking: Cleanup after PointerChoreographer refactor
  InputManager: Cleanup after PointerChoreogpraher refactor
parents 2a692149 76342abe

core/java/android/hardware/input/IInputManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ interface IInputManager { 


    IInputDeviceBatteryState getBatteryState(int deviceId);



    void setPointerIconType(int typeId);

    void setCustomPointerIcon(in PointerIcon icon);

    boolean setPointerIcon(in PointerIcon icon, int displayId, int deviceId, int pointerId,

            in IBinder inputToken);

core/java/android/hardware/input/InputManager.java

+3 −10
Original line number Diff line number Diff line
@@ -992,21 +992,14 @@ public final class InputManager { 
    }



    /**

     * Changes the mouse pointer's icon shape into the specified id.

     *

     * @param iconId The id of the pointer graphic, as a value between

     * {@link PointerIcon#TYPE_ARROW} and {@link PointerIcon#TYPE_HANDWRITING}.

     * This method exists for backwards-compatibility, and is a no-op.

     *

     * @deprecated

     * @hide

     */

    @UnsupportedAppUsage

    public void setPointerIconType(int iconId) {

        mGlobal.setPointerIconType(iconId);

    }



    /** @hide */

    public void setCustomPointerIcon(PointerIcon icon) {

        mGlobal.setCustomPointerIcon(icon);

        Log.e(TAG, "setPointerIcon: Unsupported app usage!");

    }



    /** @hide */

core/java/android/hardware/input/InputManagerGlobal.java

+0 −22
Original line number Diff line number Diff line
@@ -1410,28 +1410,6 @@ public final class InputManagerGlobal { 
        return injectInputEvent(event, mode, Process.INVALID_UID);

    }



    /**

     * @see InputManager#setPointerIconType(int)

     */

    public void setPointerIconType(int iconId) {

        try {

            mIm.setPointerIconType(iconId);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    /**

     * @see InputManager#setCustomPointerIcon(PointerIcon)

     */

    public void setCustomPointerIcon(PointerIcon icon) {

        try {

            mIm.setCustomPointerIcon(icon);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    /**

     * @see InputManager#setPointerIcon(PointerIcon, int, int, int, IBinder)

     */

core/java/android/view/IWindow.aidl

+0 −5
Original line number Diff line number Diff line
@@ -107,11 +107,6 @@ oneway interface IWindow { 
     */

    void dispatchDragEvent(in DragEvent event);



    /**

     * Pointer icon events

     */

    void updatePointerIcon(float x, float y);



    /**

     * Called for non-application windows when the enter animation has completed.

     */

core/java/android/view/IWindowSession.aidl

+0 −2
Original line number Diff line number Diff line
@@ -288,8 +288,6 @@ interface IWindowSession { 


    oneway void finishMovingTask(IWindow window);



    oneway void updatePointerIcon(IWindow window);



    /**

     * Update a tap exclude region identified by provided id in the window. Touches on this region

     * will neither be dispatched to this window nor change the focus to this window. Passing an