commit e9c4c5016849ec76f5b94c9661f030fd7e190740
author Winson Chung <winsonc@google.com> Tue Apr 09 15:11:53 2019 -0700
committer Winson Chung <winsonc@google.com> Wed Apr 10 22:11:19 2019 +0000
tree aa21fc45ab7a26db40b92ed189202f8e354cfa47
parent 731242ee6670699aab571fa66fd8f53e18a33d95

Temporarily disable screen pinning UI in gesture nav

Bug: 130225926
Change-Id: I782a5c6cdf00dfb8e501185f58defed4bfee3ac1
(cherry picked from commit e041ba0d6167bb041b9cf5e78ad593f3cb1cdc7c)

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
index 42a28fb..6e98a5a 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -290,6 +290,10 @@
             if (sysUiProxy == null) {
                 return null;
             }
+            if (SysUINavigationMode.getMode(activity) == SysUINavigationMode.Mode.NO_BUTTON) {
+                // TODO(b/130225926): Temporarily disable pinning while gesture nav is enabled
+                return null;
+            }
             if (!ActivityManagerWrapper.getInstance().isScreenPinningEnabled()) {
                 return null;
             }