commit 9582f61b745fcbf0974fa11357bffec3364dd300
author Winson Chung <winsonc@google.com> Wed Apr 10 04:01:48 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 04:01:48 2019 +0000
tree b252295b23211fab29bcc629f356ac02218dd57a
parent ad7a28203981a636a0a013765f90dd407ca5e895
parent e041ba0d6167bb041b9cf5e78ad593f3cb1cdc7c

Merge "Temporarily disable screen pinning UI in gesture nav" into ub-launcher3-master

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;
             }