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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14637304 Change-Id: I19dbcbef058cfce4cee1fd87885ca96488eeb311
2021-05-19 19:33:15 +00:00
parent aeb6e508d1 675d845b00
commit e026eb80ec
1 changed files with 1 additions and 1 deletions
@@ -231,7 +231,7 @@ public interface TaskShortcutFactory {
        @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);
            }