From 5547632ca0a42d38e9f37ba185398bce1e7c09f8 Mon Sep 17 00:00:00 2001
From: Feng Cao <fengcao@google.com>
Date: Mon, 16 Mar 2020 15:58:15 -0700
Subject: [PATCH] Intercept the click from inline suggestion child view.

* so that the parent view's onClick, onLongClick listeners
  as well as scrolling still works
* explicitly invoke child view's onClick and onLongClick
  listeners from the parent view's listeners

Test: manual verification
Bug: 150321630

Change-Id: Ie9e9b5a17fa15b502c51a2fbb6af2c09a77d567f
---
 .../service/autofill/InlineSuggestionRenderService.java     | 6 ++++++
 .../java/android/service/autofill/InlineSuggestionRoot.java | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/core/java/android/service/autofill/InlineSuggestionRenderService.java b/core/java/android/service/autofill/InlineSuggestionRenderService.java
index f0a72c501f776..7fbc309d308c2 100644
--- a/core/java/android/service/autofill/InlineSuggestionRenderService.java
+++ b/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()");
diff --git a/core/java/android/service/autofill/InlineSuggestionRoot.java b/core/java/android/service/autofill/InlineSuggestionRoot.java
index bdcc2531e4857..6c9d36b329ffa 100644
--- a/core/java/android/service/autofill/InlineSuggestionRoot.java
+++ b/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) {