diff options
| author | Winson Chung <winsonc@google.com> | 2019-05-01 04:07:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-01 04:07:05 +0000 |
| commit | d16f87f52d969578613abb3f17ed960ff1fefc56 (patch) | |
| tree | a45dc54a746b8e8017fd11062af90f373eb26661 | |
| parent | 989f3747e2646e06b82cbd19e130f67ec193db6d (diff) | |
| parent | e6ef8dac281c7185eb4440a77467a43a7c1c454a (diff) | |
| download | android_packages_apps_Trebuchet-d16f87f52d969578613abb3f17ed960ff1fefc56.tar.gz android_packages_apps_Trebuchet-d16f87f52d969578613abb3f17ed960ff1fefc56.tar.bz2 android_packages_apps_Trebuchet-d16f87f52d969578613abb3f17ed960ff1fefc56.zip | |
Merge "Removing screen pinning flag check" into ub-launcher3-qt-dev
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | 7 |
1 files changed, 3 insertions, 4 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 dfcc2b70d..09a1f3b23 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -24,7 +24,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; import android.annotation.TargetApi; import android.app.ActivityManager.RunningTaskInfo; @@ -436,9 +435,9 @@ public class TouchInteractionService extends Service implements } private boolean isInValidSystemUiState() { - return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) == 0 - && (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 - && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0; + return (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 + && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0 + && !ActivityManagerWrapper.getInstance().isLockToAppActive(); } private InputConsumer newConsumer(boolean useSharedState, MotionEvent event) { |