diff options
| author | Prabir Pradhan <prabirmsp@google.com> | 2020-11-17 13:19:46 -0800 |
|---|---|---|
| committer | Prabir Pradhan <prabirmsp@google.com> | 2020-12-16 19:34:07 +0000 |
| commit | a26dd05602d9eeb2fc8c0f6ca80ecd3f59fe54d3 (patch) | |
| tree | 41ca7aa4c1fcb33b1f0be5305f8750fffdb15f7e /core/java/android | |
| parent | dd34a21bb4c1219743b7172e6ee530085e2a6eb9 (diff) | |
SyncPointerCapture (7/n): Clean up unused code from old Pointer Capture
After the pipeline changes to Pointer Capture, this CL cleans up the
following:
- The old way of notifying windows of Pointer Capture
(IWindow::dispatchPointerCaptureChanged) is removed.
- Tracking Pointer Capture in WindowManagerService is removed.
Bug: 141749603
Test: manual, flash crosshatch, pointer capture works.
Change-Id: I5bbcef42fe8d0d93a64a4a411b1d493fcb800f92
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/IWindow.aidl | 5 | ||||
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 10 |
2 files changed, 1 insertions, 14 deletions
diff --git a/core/java/android/view/IWindow.aidl b/core/java/android/view/IWindow.aidl index e685b30421be..fb012ebbc3db 100644 --- a/core/java/android/view/IWindow.aidl +++ b/core/java/android/view/IWindow.aidl @@ -130,11 +130,6 @@ oneway interface IWindow { void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId); /** - * Tell the window that it is either gaining or losing pointer capture. - */ - void dispatchPointerCaptureChanged(boolean hasCapture); - - /** * Called when Scroll Capture support is requested for a window. * * @param callbacks to receive responses diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d24380bfc2ac..52ce5e709990 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -8665,7 +8665,7 @@ public final class ViewRootImpl implements ViewParent, MSG_REQUEST_KEYBOARD_SHORTCUTS, deviceId, 0, receiver).sendToTarget(); } - public void dispatchPointerCaptureChanged(boolean on) { + private void dispatchPointerCaptureChanged(boolean on) { final int what = MSG_POINTER_CAPTURE_CHANGED; mHandler.removeMessages(what); Message msg = mHandler.obtainMessage(what); @@ -9438,14 +9438,6 @@ public final class ViewRootImpl implements ViewParent, } @Override - public void dispatchPointerCaptureChanged(boolean hasCapture) { - final ViewRootImpl viewAncestor = mViewAncestor.get(); - if (viewAncestor != null) { - viewAncestor.dispatchPointerCaptureChanged(hasCapture); - } - } - - @Override public void requestScrollCapture(IScrollCaptureCallbacks callbacks) { final ViewRootImpl viewAncestor = mViewAncestor.get(); if (viewAncestor != null) { |
