commit dd535466bf2ce88e07d489fa05a9caed274b028e
author Tony Wickham <twickham@google.com> Thu Mar 01 12:36:02 2018 -0800
committer Tony Wickham <twickham@google.com> Thu Mar 01 12:43:17 2018 -0800
tree 282b1f6d0a1d2490012313657d3f8bf1784717c3
parent 22ab784dd0c49652d8441fd5fd919f4ab4b13cee

Don't show Pin option when an locked to app is active

Also isLockToAppEnabled is renamed to isScreenPinningEnabled

Bug: 72799389
Change-Id: I46d4c57e3719f7401887e79cbb7397e23f162e44

quickstep/libs/sysui_shared.jar

diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 0e45791..d76cd25 100644
--- a/quickstep/libs/sysui_shared.jar
+++ b/quickstep/libs/sysui_shared.jar
Binary files differ

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

diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index e172291..fb14fb8 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -182,7 +182,11 @@
             if (sysUiProxy == null) {
                 return null;
             }
-            if (!ActivityManagerWrapper.getInstance().isLockToAppEnabled()) {
+            if (!ActivityManagerWrapper.getInstance().isScreenPinningEnabled()) {
+                return null;
+            }
+            if (ActivityManagerWrapper.getInstance().isLockToAppActive()) {
+                // We shouldn't be able to pin while an app is locked.
                 return null;
             }
             return view -> {