commit 1d96d2370f2d81acd596e268f45d39157181abcd
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 17 01:48:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 01:48:23 2020 +0000
tree 33de786660a879ef1dffef0d83ae8219804d1456
parent 30d771860e0234bd07465d13edada55b1f187164
parent 95c620c38d5f9c61704d408983b08d21e1896adc

Merge "Let AllAppsEduView consume touch until animation is done and view is removed." into ub-launcher3-rvc-qpr-dev am: 95c620c38d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12121641

Change-Id: I70aa4d0ffa4dfd2ef21d7ea54a7293b4243cf1cd

quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java
index 3d44eb6..c06dd9c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java
@@ -54,6 +54,7 @@
 
 /**
  * View used to educate the user on how to access All Apps when in No Nav Button navigation mode.
+ * Consumes all touches until after the animation is completed and the view is removed.
  */
 public class AllAppsEduView extends AbstractFloatingView {
 
@@ -114,8 +115,18 @@
     }
 
     @Override
+    public boolean onBackPressed() {
+        return true;
+    }
+
+    @Override
+    public boolean canInterceptEventsInSystemGestureRegion() {
+        return true;
+    }
+
+    @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
-        return mAnimation != null && mAnimation.isRunning();
+        return true;
     }
 
     private void playAnimation() {