commit a1a171633fc4cdee61d56a414d686295630ddd71
author Winson Chung <winsonc@google.com> Thu Jun 13 12:11:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 12:11:42 2019 -0700
tree 7427bceadd8612ddb52acc027501749f0502d4de
parent a9c0d66d6c9bd9ca625d5cd1a8cd352b86dfc4a6
parent 6e25a9d8319a7df686e12996c01f2f6b6416c21e

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

Change-Id: Ie05e87df5af4f09fb77cb999982c0b4ef2ec659f

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