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

Commit e23de22b authored by Alex Mitra's avatar Alex Mitra
Browse files

Override View#onResolvePointerIcon for WebViews 

https://developer.android.com/reference/android/view/View#onResolvePointerIcon(android.view.MotionEvent,%20int)

Bug:296993176
Change-Id: Ic61c416ecfb59b79d49fd19d6706f3fbfd7a2d7a
parent b090b16d

core/java/android/webkit/WebView.java

+12 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.util.SparseArray; 
import android.view.DragEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.PointerIcon;

import android.view.View;

import android.view.ViewDebug;

import android.view.ViewGroup;
@@ -3139,4 +3140,15 @@ public class WebView extends AbsoluteLayout 
        if (result == null) return super.onApplyWindowInsets(insets);

        return result;

    }



    @Override

    @Nullable

    public PointerIcon onResolvePointerIcon(@NonNull MotionEvent event, int pointerIndex) {

        PointerIcon icon =

                mProvider.getViewDelegate().onResolvePointerIcon(event, pointerIndex);

        if (icon != null) {

            return icon;

        }

        return super.onResolvePointerIcon(event, pointerIndex);

    }

}

core/java/android/webkit/WebViewProvider.java

+10 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.util.SparseArray; 
import android.view.DragEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.PointerIcon;

import android.view.View;

import android.view.ViewGroup.LayoutParams;

import android.view.WindowInsets;
@@ -496,6 +497,15 @@ public interface WebViewProvider { 
        default WindowInsets onApplyWindowInsets(@Nullable WindowInsets insets) {

            return null;

        }



        /**

         * @hide Only used by WebView.

         */

        @SuppressWarnings("unused")

        @Nullable

        default PointerIcon onResolvePointerIcon(@NonNull MotionEvent event, int pointerIndex) {

            return null;

        }

    }



    interface ScrollDelegate {