commit 49d003da914eed5cad9ee7235974555651eae566
author Vinit Nayak <peanutbutter@google.com> Wed May 19 19:07:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 19 19:07:57 2021 +0000
tree 62506272b184166095231fd41925d077d535689d
parent 9cf28c83fe774786363a65c02d71eaf81abd0fb1
parent 887bfef15775a33f4aa87f59130b4a005ef8c5df

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14637304

Change-Id: Ia10e04790c3936918f9f678907bd8182431d392e

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