commit b33bd1e0ffb02fe968d006b771f66c5805e9bb96
author Winson Chung <winsonc@google.com> Thu Jun 13 12:18:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 12:18:44 2019 -0700
tree dafc3872bcf711c626a919a8936cbe8bc0025f4f
parent ec22f7e05aab81b573d8304c32a1326e25f78d25
parent a1a171633fc4cdee61d56a414d686295630ddd71

Fix issue with screen pinning check not apply in 2 button am: 6e25a9d831
am: a1a171633f

Change-Id: Ia89fcb61ef8185bda6debc04b3e33e94120d60ae

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 097ff46..3ace25a 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -547,6 +547,10 @@
                         (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0, base,
                         mInputMonitorCompat, mSwipeTouchRegion);
             }
+        } else {
+            if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) {
+                base = mResetGestureInputConsumer;
+            }
         }
         return base;
     }