Merge "Removing screen pinning flag check" into ub-launcher3-qt-dev

This commit is contained in:
Winson Chung
2019-05-01 04:07:05 +00:00
committed by Android (Google) Code Review
@@ -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_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_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_NOTIFICATION_PANEL_EXPANDED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityManager.RunningTaskInfo;
@@ -436,9 +435,9 @@ public class TouchInteractionService extends Service implements
} }
private boolean isInValidSystemUiState() { private boolean isInValidSystemUiState() {
return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) == 0 return (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0; && !ActivityManagerWrapper.getInstance().isLockToAppActive();
} }
private InputConsumer newConsumer(boolean useSharedState, MotionEvent event) { private InputConsumer newConsumer(boolean useSharedState, MotionEvent event) {