commit 7c9e8c2ed7c7213b14e3e5fd218b89f24be3258a
author Vinit Nayak <peanutbutter@google.com> Thu Jun 10 06:04:01 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 10 06:04:01 2021 +0000
tree 1dae874cb655689906909bf83c6afa47772d37cf
parent 9f710f137df842c090bc5ea113902543b10a6a4b
parent 0054869649a42901bc19209211b29bd5397200c2

Merge "Check for null shortcut before adding new split select options" into sc-v2-dev am: 1e846622c7 am: 0054869649

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

Change-Id: Ia0d1e25b57da4715850b8b49ca4f34c9aa671f69

quickstep/src/com/android/quickstep/TaskOverlayFactory.java

diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index c1c85de..7297107 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -68,13 +68,14 @@
         final BaseDraggingActivity activity = BaseActivity.fromContext(taskView.getContext());
         for (TaskShortcutFactory menuOption : MENU_OPTIONS) {
             SystemShortcut shortcut = menuOption.getShortcut(activity, taskView);
-            if (menuOption == TaskShortcutFactory.SPLIT_SCREEN &&
-                    FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
-                addSplitOptions(shortcuts, activity, taskView, deviceProfile);
+            if (shortcut == null) {
                 continue;
             }
 
-            if (shortcut != null) {
+            if (menuOption == TaskShortcutFactory.SPLIT_SCREEN &&
+                    FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
+                addSplitOptions(shortcuts, activity, taskView, deviceProfile);
+            } else {
                 shortcuts.add(shortcut);
             }
         }