commit 887bfef15775a33f4aa87f59130b4a005ef8c5df
author Vinit Nayak <peanutbutter@google.com> Wed May 19 19:03:21 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 19 19:03:21 2021 +0000
tree 59cf434537b4f77033842736b5a76cd3e6988e72
parent b1114a9834ea0ab1fded31c95ffafe859ab214a4
parent 719154dc1bfc2b717042001945f9e147e8a72722

Merge "Don't set enabled on TaskMenu view if shortcut not available" into sc-dev

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index c06e9a9..4ec1c15 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -231,7 +231,7 @@
         @Override
         public SystemShortcut getShortcut(BaseDraggingActivity activity, TaskView taskView) {
             SystemShortcut shortcut = super.getShortcut(activity, taskView);
-            if (FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
+            if (shortcut != null && FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
                 // Disable if there's only one recent app for split screen
                 shortcut.setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);
             }