Merge "Intercept the click from inline suggestion child view." into rvc-dev am: 82a087ddef

Change-Id: I96d8c5f03372dc8be779014fde4cc6fb669dd8fd

core/java/android/service/autofill/InlineSuggestionRenderService.java

@@ -97,6 +97,9 @@ public abstract class InlineSuggestionRenderService extends Service {
             host.setView(suggestionRoot, lp);
             suggestionRoot.setOnClickListener((v) -> {
                 try {
+                    if (suggestionView.hasOnClickListeners()) {
+                        suggestionView.callOnClick();
+                    }
                     callback.onClick();
                 } catch (RemoteException e) {
                     Log.w(TAG, "RemoteException calling onClick()");
@@ -105,6 +108,9 @@ public abstract class InlineSuggestionRenderService extends Service {
 
             suggestionRoot.setOnLongClickListener((v) -> {
                 try {
+                    if (suggestionView.hasOnLongClickListeners()) {
+                        suggestionView.performLongClick();
+                    }
                     callback.onLongClick();
                 } catch (RemoteException e) {
                     Log.w(TAG, "RemoteException calling onLongClick()");

core/java/android/service/autofill/InlineSuggestionRoot.java

@@ -51,6 +51,11 @@ public class InlineSuggestionRoot extends FrameLayout {
         setFocusable(false);
     }
 
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        return true;
+    }
+
     @Override
     @SuppressLint("ClickableViewAccessibility")
     public boolean onTouchEvent(@NonNull MotionEvent event) {