commit 24e3b6598e432af3b987a52a27f950165fbbda64
author Samuel Fufa <sfufa@google.com> Wed May 13 20:41:35 2020 -0700
committer Samuel Fufa <sfufa@google.com> Wed May 13 20:41:35 2020 -0700
tree ff291ee730a1f983927890fff11371295ad3052f
parent bdd6522661e4a062ed575cf2d452d059b8826886

Prevent AllApps scroller activation in NORMAL state

Bug: 153663434
Test: Manual
Change-Id: I859d63fff08091961970d72f56853b50433f6d44

src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 80b6a5a..a6bc6cf 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -60,6 +60,14 @@
     }
 
     @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);
         mLauncher.getAllAppsController()