commit 675d845b000619b078c7ea030aebdfe107633245
author Vinit Nayak <peanutbutter@google.com> Wed May 19 19:10:01 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 19 19:10:01 2021 +0000
tree de545f0eed1eda06a8db1f1e8c24f1ae273f00ed
parent 6019318f9ecc5027b7b75914864f75c76658aefe
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: Ic257537c32a25d43098b520c4a9a352260404e10

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