commit 9de282c862568202de37906500e8086942fc3828
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 15 00:52:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 15 00:52:32 2020 +0000
tree 5bf749f528bd44d0b641a9af69a97205ca820685
parent 5670d462de2c7c552b0f1ac7275f3bcd4442f9a3
parent 24e3b6598e432af3b987a52a27f950165fbbda64

Merge "Prevent AllApps scroller activation in NORMAL state" into ub-launcher3-rvc-dev

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()