[Autofill Assistant] Scrolling is now disabled when showing full-screen...

[Autofill Assistant] Scrolling is now disabled when showing full-screen overlays (but remains enabled for partial-screen overlays).

Refactored the touch event filter to support setting full and partial overlays independently. This also fixes a screen flickering issue that could occur when a full overlay was disabled while a partial overlay was enabled.

Bug: 806868
Change-Id: Idac393d47293020ab76fb04aa55d08291a25f27d
Reviewed-on: https://chromium-review.googlesource.com/c/1340306Reviewed-by: Stephane Zermatten <szermatt@chromium.org>
Commit-Queue: Clemens Arbesser <arbesser@google.com>
Cr-Commit-Position: refs/heads/master@{#609322}

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiDelegate.java

@@ -456,12 +456,12 @@ class AutofillAssistantUiDelegate {
 
     /** Called to show overlay. */
     public void showOverlay() {
-        mTouchEventFilter.setEnableFiltering(true);
+        mTouchEventFilter.setFullOverlay(true);
     }
 
     /** Called to hide overlay. */
     public void hideOverlay() {
-        mTouchEventFilter.setEnableFiltering(false);
+        mTouchEventFilter.setFullOverlay(false);
     }
 
     public void hideDetails() {
@@ -657,7 +657,7 @@ class AutofillAssistantUiDelegate {
     }
 
     public void updateTouchableArea(boolean enabled, List<RectF> boxes) {
-        mTouchEventFilter.updateTouchableArea(enabled, boxes);
+        mTouchEventFilter.setPartialOverlay(enabled, boxes);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/ui/TouchEventFilter.java

@@ -70,8 +70,13 @@ public class TouchEventFilter
     private final Paint mGrayOut;
     private final Paint mClear;
 
-    /** Whether filtering is enabled. */
-    private boolean mEnabled;
+    /** Whether a partial-screen overlay is enabled or not. Has precedence over {@link
+     * @mFullOverlayEnabled}. */
+    private boolean mPartialOverlayEnabled;
+
+    /** Whether a full-screen overlay is enabled or not. Is overridden by {@link
+     * @mPartialOverlayEnabled}.*/
+    private boolean mFullOverlayEnabled;
 
     /** Padding added between the element area and the grayed-out area. */
     private final float mPaddingPx;
@@ -153,12 +158,14 @@ public class TouchEventFilter
             @Override
             public boolean onScroll(MotionEvent downEvent, MotionEvent moveEvent, float distanceX,
                     float distanceY) {
+                if (mPartialOverlayEnabled)
                     mClient.scrollBy(distanceX / getWidth(), distanceY / getVisualViewportHeight());
                 return true;
             }
         });
 
-        updateTouchableArea(false, Collections.emptyList());
+        setFullOverlay(false);
+        setPartialOverlay(false, Collections.emptyList());
     }
 
     /** Initializes dependencies. */
@@ -175,32 +182,49 @@ public class TouchEventFilter
         mGrayOut.setColor(color);
     }
 
-    /** Enables/disables the filter. Clears all currently set touchable areas. */
-    public void setEnableFiltering(boolean enabled) {
-        if (mEnabled != enabled) {
-            clearTouchableArea();
-            mEnabled = enabled;
-            setAlpha(mEnabled ? 1.0f : 0.0f);
-
-            // reset tap counter each time the filter is disabled.
-            if (!mEnabled) mUnexpectedTapTimes.clear();
+    /**
+     * Enables/disables a full screen overlay.
+     *
+     * If both a full and a partial screen overlay are set, the partial overlay has precedence.
+     *
+     * @param enabled if {@code false}, the full screen overlay is disabled
+     */
+    public void setFullOverlay(boolean enabled) {
+        if (mFullOverlayEnabled != enabled) {
+            mFullOverlayEnabled = enabled;
 
+            // reset tap counter each time the full screen overlay is disabled.
+            if (!mFullOverlayEnabled) mUnexpectedTapTimes.clear();
+            updateVisibility();
             invalidate();
         }
     }
 
     /**
-     * Defines the area of the visible viewport that can be used.
+     * Enables/disables a partial screen overlay.
+     *
+     * If both a full and a partial screen overlay are set, the partial overlay has precedence.
      *
-     * @param enabled if {@code false}, the filter is fully disabled and invisible
+     * @param enabled if {@code false}, the partial overlay is disabled
      * @param rectangles rectangles defining the area that can be used, may be empty
      */
-    public void updateTouchableArea(boolean enabled, List<RectF> rectangles) {
-        setEnableFiltering(enabled);
-        if (!mTouchableArea.equals(rectangles)) {
+    public void setPartialOverlay(boolean enabled, List<RectF> rectangles) {
+        if (mPartialOverlayEnabled != enabled || (enabled && !mTouchableArea.equals(rectangles))) {
+            mPartialOverlayEnabled = enabled;
+
             clearTouchableArea();
             mTouchableArea.addAll(rectangles);
+            updateVisibility();
+            invalidate();
+        }
+    }
+
+    private boolean isOverlayShown() {
+        return mFullOverlayEnabled || mPartialOverlayEnabled;
     }
+
+    private void updateVisibility() {
+        setAlpha(isOverlayShown() ? 1.0f : 0.0f);
     }
 
     private void clearTouchableArea() {
@@ -208,16 +232,21 @@ public class TouchEventFilter
         mOffsetY = 0;
         mInitialBrowserScrollOffsetY += mBrowserScrollOffsetY;
         mBrowserScrollOffsetY = 0;
-        invalidate();
     }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
+        // Note that partial overlays have precedence over full overlays
+        if (mPartialOverlayEnabled) return dispatchTouchEventWithPartialOverlay(event);
+        if (mFullOverlayEnabled) return dispatchTouchEventWithFullOverlay(event);
+        return false;
+    }
+
+    private boolean dispatchTouchEventWithPartialOverlay(MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_SCROLL:
                 // Scrolling is always safe. Let it through.
                 return false;
-
             case MotionEvent.ACTION_MOVE:
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
@@ -236,8 +265,6 @@ public class TouchEventFilter
             // fallthrough
 
             case MotionEvent.ACTION_DOWN:
-                if (!mEnabled) return false; // let everything through
-
                 // Only let through events if they're meant for the touchable area of the screen.
                 int yTop = getVisualViewportTop();
                 int yBottom = getVisualViewportBottom();
@@ -259,12 +286,17 @@ public class TouchEventFilter
         }
     }
 
+    private boolean dispatchTouchEventWithFullOverlay(MotionEvent event) {
+        mNonBrowserGesture.onTouchEvent(event);
+        return true;
+    }
+
     /** Returns the origin of the visual viewport in this view. */
     @Override
     @SuppressLint("CanvasSize")
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        if (!mEnabled) {
+        if (!isOverlayShown()) {
             return;
         }
         canvas.drawPaint(mGrayOut);