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

Commit 76342abe authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

WM mouse pointer tracking: Cleanup after PointerChoreographer refactor 

Remove mouse pointer tracking and icon updating logic from WM, now that
the PointerChoreographer refactor is complete and all pointer icon
updates happen directly in input.

Bug: 311416205
Test: build, presubmit
Change-Id: I622e0d116c8570bc1a0880b868aa11b29776a3c1
parent 61006ccf

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

core/java/android/view/ViewRootImpl.java

+0 −18
Original line number Diff line number Diff line
@@ -10542,16 +10542,6 @@ public final class ViewRootImpl implements ViewParent, 
        mHandler.sendMessage(msg);

    }













    public void updatePointerIcon(float x, float y) {













        final int what = MSG_UPDATE_POINTER_ICON;













        mHandler.removeMessages(what);













        final long now = SystemClock.uptimeMillis();













        final MotionEvent event = MotionEvent.obtain(













                0, now, MotionEvent.ACTION_HOVER_MOVE, x, y, 0);













        Message msg = mHandler.obtainMessage(what, event);













        mHandler.sendMessage(msg);













    }



























    public void dispatchCheckFocus() {















        if (!mHandler.hasMessages(MSG_CHECK_FOCUS)) {















            // This will result in a call to checkFocus() below.










@@ -11414,14 +11404,6 @@ public final class ViewRootImpl implements ViewParent,













            }















        }



























        @Override













        public void updatePointerIcon(float x, float y) {













            final ViewRootImpl viewAncestor = mViewAncestor.get();













            if (viewAncestor != null) {













                viewAncestor.updatePointerIcon(x, y);













            }













        }



























        @Override















        public void dispatchWindowShown() {















            final ViewRootImpl viewAncestor = mViewAncestor.get();

































core/java/android/view/WindowlessWindowManager.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -602,10 +602,6 @@ public class WindowlessWindowManager implements IWindowSession {













    public void finishMovingTask(android.view.IWindow window) {















    }





























    @Override













    public void updatePointerIcon(android.view.IWindow window) {













    }





























    @Override















    public void updateTapExcludeRegion(android.view.IWindow window,















            android.graphics.Region region) {

































core/java/com/android/internal/view/BaseIWindow.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -125,10 +125,6 @@ public class BaseIWindow extends IWindow.Stub {













        }















    }





























    @Override













    public void updatePointerIcon(float x, float y) {













    }





























    @Override















    public void dispatchWallpaperCommand(String action, int x, int y,















            int z, Bundle extras, boolean sync) {