| commit | 90b22110d87eba0bf472943d7eb231cd827e0e52 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 15 01:10:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 15 01:10:14 2020 +0000 |
| tree | 1e7048ea589e4883b5fdb42aa808be6bd665d6a0 | |
| parent | 4507024997409d53371ad70d23e96c685a6fe44d [diff] | |
| parent | 9de282c862568202de37906500e8086942fc3828 [diff] |
Merge "Prevent AllApps scroller activation in NORMAL state" into ub-launcher3-rvc-dev am: 9de282c862 Change-Id: I3f5aef42242543bba6bc7743c635d08eee649e81
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()