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

Commit 28984d4d authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 

am: c396f0f7

* commit 'c396f0f7':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
parents 9b22e5b4 c396f0f7

api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -42554,7 +42554,6 @@ package android.view { 
    method public boolean hasNestedScrollingParent();

    method public boolean hasOnClickListeners();

    method public boolean hasOverlappingRendering();

    method public boolean hasPointerCapture();

    method public boolean hasTransientState();

    method public boolean hasWindowFocus();

    method public static android.view.View inflate(android.content.Context, int, android.view.ViewGroup);
@@ -42685,7 +42684,6 @@ package android.view { 
    method public void postOnAnimation(java.lang.Runnable);

    method public void postOnAnimationDelayed(java.lang.Runnable, long);

    method public void refreshDrawableState();

    method public void releasePointerCapture();

    method public boolean removeCallbacks(java.lang.Runnable);

    method public void removeOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);

    method public void removeOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);
@@ -42696,7 +42694,6 @@ package android.view { 
    method public boolean requestFocus(int, android.graphics.Rect);

    method public final boolean requestFocusFromTouch();

    method public void requestLayout();

    method public void requestPointerCapture();

    method public boolean requestRectangleOnScreen(android.graphics.Rect);

    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);

    method public final void requestUnbufferedDispatch(android.view.MotionEvent);

api/system-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -45552,7 +45552,6 @@ package android.view { 
    method public boolean hasNestedScrollingParent();

    method public boolean hasOnClickListeners();

    method public boolean hasOverlappingRendering();

    method public boolean hasPointerCapture();

    method public boolean hasTransientState();

    method public boolean hasWindowFocus();

    method public static android.view.View inflate(android.content.Context, int, android.view.ViewGroup);
@@ -45683,7 +45682,6 @@ package android.view { 
    method public void postOnAnimation(java.lang.Runnable);

    method public void postOnAnimationDelayed(java.lang.Runnable, long);

    method public void refreshDrawableState();

    method public void releasePointerCapture();

    method public boolean removeCallbacks(java.lang.Runnable);

    method public void removeOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);

    method public void removeOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);
@@ -45694,7 +45692,6 @@ package android.view { 
    method public boolean requestFocus(int, android.graphics.Rect);

    method public final boolean requestFocusFromTouch();

    method public void requestLayout();

    method public void requestPointerCapture();

    method public boolean requestRectangleOnScreen(android.graphics.Rect);

    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);

    method public final void requestUnbufferedDispatch(android.view.MotionEvent);

api/test-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -42634,7 +42634,6 @@ package android.view { 
    method public boolean hasNestedScrollingParent();

    method public boolean hasOnClickListeners();

    method public boolean hasOverlappingRendering();

    method public boolean hasPointerCapture();

    method public boolean hasTransientState();

    method public boolean hasWindowFocus();

    method public static android.view.View inflate(android.content.Context, int, android.view.ViewGroup);
@@ -42765,7 +42764,6 @@ package android.view { 
    method public void postOnAnimation(java.lang.Runnable);

    method public void postOnAnimationDelayed(java.lang.Runnable, long);

    method public void refreshDrawableState();

    method public void releasePointerCapture();

    method public boolean removeCallbacks(java.lang.Runnable);

    method public void removeOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);

    method public void removeOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);
@@ -42776,7 +42774,6 @@ package android.view { 
    method public boolean requestFocus(int, android.graphics.Rect);

    method public final boolean requestFocusFromTouch();

    method public void requestLayout();

    method public void requestPointerCapture();

    method public boolean requestRectangleOnScreen(android.graphics.Rect);

    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);

    method public final void requestUnbufferedDispatch(android.view.MotionEvent);

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

+0 −2
Original line number Diff line number Diff line
@@ -81,6 +81,4 @@ interface IInputManager { 


    void setPointerIconType(int typeId);

    void setCustomPointerIcon(in PointerIcon icon);



    void setPointerIconDetached(boolean detached);

}

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

+0 −18
Original line number Diff line number Diff line
@@ -893,24 +893,6 @@ public final class InputManager { 
        }

    }



    /**

     * Update the pointer icon status. When detached, the pointer icon disappears, and further

     * mouse location will be stuck at the current point. Mouse movement events will still arrive,

     * and movement should be handled through {@link MotionEvent.AXIS_RELATIVE_X} and

     * {@link MotionEvent.AXIS_RELATIVE_Y}.

     *

     * @param detached true if the icon will be detached from the actual mouse movement.

     *

     * @hide

     */

    public void setPointerIconDetached(boolean detached) {

        try {

            mIm.setPointerIconDetached(detached);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    private void populateInputDevicesLocked() {

        if (mInputDevicesChangedListener == null) {

            final InputDevicesChangedListener listener = new InputDevicesChangedListener();