Temporarily disable screen pinning UI in gesture nav

Bug: 130225926
Change-Id: I782a5c6cdf00dfb8e501185f58defed4bfee3ac1
(cherry picked from commit e041ba0d61)
This commit is contained in:
Winson Chung 2019-04-09 15:11:53 -07:00
parent 731242ee66
commit e9c4c50168
1 changed files with 4 additions and 0 deletions

View File

@ -290,6 +290,10 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
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;
}