From 58d74c3dd9019cc80b1f9895a7c8dbbab2df87ec Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Thu, 9 Jul 2020 13:40:21 -0700 Subject: [PATCH] Let AllAppsEduView consume touch until animation is done and view is removed. Bug: 160760115 Bug: 160761752 Change-Id: Ie7ab0b4c6e61dc862cac10fa961b8d1c11c6cb10 --- .../com/android/quickstep/views/AllAppsEduView.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 3d44eb613d..c06dd9c0bd 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 @@ import com.android.quickstep.util.MultiValueUpdateListener; /** * 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 { @@ -113,9 +114,19 @@ public class AllAppsEduView extends AbstractFloatingView { return (type & TYPE_ALL_APPS_EDU) != 0; } + @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() {