From 4247a72b445bcb89ca6a3dd3600c2b61402b38cc Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Fri, 10 Sep 2021 12:24:09 -0700 Subject: [PATCH] Update SYSUI_STATE_SCREEN_PINNING in TaskbarDelegate Test: On a device with taskbar but not nav bar, pin an app and ensure can't swipe up to exit to home Bug: 190192993 Change-Id: I050643d0d5cea30f172e24716a8480cf79ed3649 --- .../com/android/systemui/navigationbar/TaskbarDelegate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index 3167070e2c3e4..ecc3245e286ab 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java @@ -30,6 +30,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_I import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; import android.app.StatusBarManager; import android.app.StatusBarManager.WindowVisibleState; @@ -46,6 +47,7 @@ import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.shared.recents.utilities.Utilities; +import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.statusbar.CommandQueue; import javax.inject.Inject; @@ -126,6 +128,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, .setFlag(SYSUI_STATE_NAV_BAR_HIDDEN, !isWindowVisible()) .setFlag(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY, allowSystemGestureIgnoringBarVisibility()) + .setFlag(SYSUI_STATE_SCREEN_PINNING, + ActivityManagerWrapper.getInstance().isScreenPinningActive()) .commitUpdate(mDisplayId); }