commit 073ea47a0749cfdf7d70608c00d053c89b5c3f1e
author Vinit Nayak <peanutbutter@google.com> Wed May 19 19:08:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 19 19:08:24 2021 +0000
tree c486bf5545a0dacada07365e820bdb3e40567c4f
parent 9cee70d723bd90e22ce5607aff697ebe18f97a84
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: I890cf45c17e7133f7255c06fc6fa331725b5a589

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