From 24e3b6598e432af3b987a52a27f950165fbbda64 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 13 May 2020 20:41:35 -0700
Subject: [PATCH] Prevent AllApps scroller activation in NORMAL state

Bug: 153663434
Test: Manual
Change-Id: I859d63fff08091961970d72f56853b50433f6d44
---
 .../launcher3/allapps/LauncherAllAppsContainerView.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 80b6a5ab96..a6bc6cf59f 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -59,6 +59,14 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
         return super.onInterceptTouchEvent(ev);
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (!mLauncher.isInState(LauncherState.ALL_APPS)) {
+            return false;
+        }
+        return super.onTouchEvent(ev);
+    }
+
     @Override
     public void setInsets(Rect insets) {
         super.setInsets(insets);