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

Commit b0c3a9b2 authored by Alex Mitra's avatar Alex Mitra Committed by Automerger Merge Worker
Browse files

Merge "Override View#onResolvePointerIcon for WebViews" into udc-qpr-dev am:... 

Merge "Override View#onResolvePointerIcon for WebViews" into udc-qpr-dev am: 5abcd747 am: b185333d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623407



Change-Id: Ib8162a3f6817c5176fb6184604ae625ef201d2b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a418a335 b185333d

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 {