| commit | e026eb80ec4dfe26918ef2f0d015fb99b0ac3aa9 | [log] [tgz] |
|---|---|---|
| author | Vinit Nayak <peanutbutter@google.com> | Wed May 19 19:33:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 19 19:33:15 2021 +0000 |
| tree | 29daf130323dde730f2dada84389553132c77785 | |
| parent | aeb6e508d1ceb59e8648731c95eb0b0056f9984c [diff] | |
| parent | 675d845b000619b078c7ea030aebdfe107633245 [diff] |
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
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); }