[Feed] Disable touch event on context menu opened or URL bar focused

Bug: 862425
Change-Id: I317be9b1cd25e921c04712fe0e04cdd0d77bd27b
Reviewed-on: https://chromium-review.googlesource.com/1185377Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585235}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java

@@ -11,6 +11,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
@@ -32,7 +33,6 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.feed.action.FeedActionHandler;
 import org.chromium.chrome.browser.native_page.NativePageHost;
 import org.chromium.chrome.browser.ntp.ContextMenuManager;
-import org.chromium.chrome.browser.ntp.ContextMenuManager.TouchEnabledDelegate;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.ntp.NewTabPageLayout;
 import org.chromium.chrome.browser.ntp.SnapScrollHelper;
@@ -56,7 +56,7 @@ import java.util.List;
 /**
  * Provides a new tab page that displays an interest feed rendered list of content suggestions.
  */
-public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
+public class FeedNewTabPage extends NewTabPage {
     private final FeedNewTabPageMediator mMediator;
     private final StreamLifecycleManager mStreamLifecycleManager;
     private final Stream mStream;
@@ -174,6 +174,12 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
             super.onConfigurationChanged(newConfig);
             mUiConfig.updateDisplayStyle();
         }
+
+        @Override
+        public boolean onInterceptTouchEvent(MotionEvent ev) {
+            return !mMediator.getTouchEnabled() || mFakeboxDelegate.isUrlBarFocused()
+                    || super.onInterceptTouchEvent(ev);
+        }
     }
 
     /**
@@ -227,8 +233,8 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
         // TODO(twellington): Move this somewhere it can be shared with NewTabPageView?
         Runnable closeContextMenuCallback = () -> mTab.getActivity().closeContextMenu();
         ContextMenuManager contextMenuManager =
-                new ContextMenuManager(mNewTabPageManager.getNavigationDelegate(),
-                        this::setTouchEnabled, closeContextMenuCallback, false);
+                new ContextMenuManager(mNewTabPageManager.getNavigationDelegate(), mMediator,
+                        closeContextMenuCallback, false);
         mTab.getWindowAndroid().addContextMenuCloseListener(contextMenuManager);
 
         mNewTabPageLayout.initialize(mNewTabPageManager, mTab, mTileGroupDelegate,
@@ -298,13 +304,6 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
         return mSectionHeaderView;
     }
 
-    // TouchEnabledDelegate interface.
-
-    @Override
-    public void setTouchEnabled(boolean enabled) {
-        // TODO(twellington): implement this method.
-    }
-
     /**
      * Configures the {@link FeedNewTabPage} for testing.
      * @param inTestMode Whether test mode is enabled. If true, test implementations of Feed

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPageMediator.java

@@ -13,6 +13,7 @@ import com.google.android.libraries.feed.api.stream.Stream;
 import org.chromium.base.MemoryPressureListener;
 import org.chromium.base.memory.MemoryPressureCallback;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ntp.ContextMenuManager;
 import org.chromium.chrome.browser.ntp.NewTabPageLayout;
 import org.chromium.chrome.browser.ntp.SnapScrollHelper;
 import org.chromium.chrome.browser.ntp.snippets.SectionHeader;
@@ -24,7 +25,8 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
  * A mediator for the {@link FeedNewTabPage} responsible for interacting with the
  * native library and handling business logic.
  */
-class FeedNewTabPageMediator implements NewTabPageLayout.ScrollDelegate {
+class FeedNewTabPageMediator
+        implements NewTabPageLayout.ScrollDelegate, ContextMenuManager.TouchEnabledDelegate {
     private final FeedNewTabPage mCoordinator;
     private final SnapScrollHelper mSnapScrollHelper;
     private final PrefChangeRegistrar mPrefChangeRegistrar;
@@ -34,6 +36,7 @@ class FeedNewTabPageMediator implements NewTabPageLayout.ScrollDelegate {
     private SectionHeader mSectionHeader;
     private MemoryPressureCallback mMemoryPressureCallback;
 
+    private boolean mTouchEnabled = true;
     private boolean mStreamContentChanged;
     private int mThumbnailWidth;
     private int mThumbnailHeight;
@@ -136,6 +139,21 @@ class FeedNewTabPageMediator implements NewTabPageLayout.ScrollDelegate {
         mStreamContentChanged = false;
     }
 
+    /**
+     * @return Whether the touch events are enabled on the {@link FeedNewTabPage}.
+     * TODO(huayinz): Move this method to a Model once a Model is introduced.
+     */
+    boolean getTouchEnabled() {
+        return mTouchEnabled;
+    }
+
+    // TouchEnabledDelegate interface.
+
+    @Override
+    public void setTouchEnabled(boolean enabled) {
+        mTouchEnabled = enabled;
+    }
+
     // ScrollDelegate interface.
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

@@ -92,7 +92,7 @@ public class NewTabPage
     private TabObserver mTabObserver;
     protected boolean mSearchProviderHasLogo;
 
-    private FakeboxDelegate mFakeboxDelegate;
+    protected FakeboxDelegate mFakeboxDelegate;
     private LocationBarVoiceRecognitionHandler mVoiceRecognitionHandler;
 
     // The timestamp at which the constructor was called.