diff options
| author | Winson Chung <winsonc@google.com> | 2019-06-13 11:17:07 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2019-06-13 11:44:44 -0700 |
| commit | 6e25a9d8319a7df686e12996c01f2f6b6416c21e (patch) | |
| tree | 7427bceadd8612ddb52acc027501749f0502d4de /quickstep/recents_ui_overrides | |
| parent | 3d6e96d5265cdea78ad4e01b0f9fde0eea539094 (diff) | |
| download | android_packages_apps_Trebuchet-6e25a9d8319a7df686e12996c01f2f6b6416c21e.tar.gz android_packages_apps_Trebuchet-6e25a9d8319a7df686e12996c01f2f6b6416c21e.tar.bz2 android_packages_apps_Trebuchet-6e25a9d8319a7df686e12996c01f2f6b6416c21e.zip | |
Fix issue with screen pinning check not apply in 2 button
Bug: 130687624
Test: Ensure you can't swipe up with screen pinning enabled in 2 button
Change-Id: I6635a9639262a4e96a104960eb5fbb3acaba8af7
Diffstat (limited to 'quickstep/recents_ui_overrides')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | 4 |
1 files changed, 4 insertions, 0 deletions
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 097ff4659..3ace25ad6 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 @@ public class TouchInteractionService extends Service implements (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0, base, mInputMonitorCompat, mSwipeTouchRegion); } + } else { + if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) { + base = mResetGestureInputConsumer; + } } return base; } |