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

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