PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I22d707d699927913bc1c12faf8f58fc8f50a4761
This commit is contained in:
Vinit Nayak
2021-06-10 05:53:18 +00:00
committed by Automerger Merge Worker
parent f02f0305d3 1e846622c7
commit 0054869649
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+5 -4
View File
@@ -68,13 +68,14 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
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);
}
}