openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap for 8055317 from d873788275 to sc-d2-release 

Change-Id: If8687df15407b188e6d53377def7ee47a8f6ece4
This commit is contained in:
Android Build Coastguard Worker 2022-01-08 02:09:08 +00:00
parent 71eb0a0677 d873788275
commit a1abc9f864
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
quickstep/src/com/android/quickstep/TaskOverlayFactory.java
View File

@ -23,6 +23,7 @@ import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBN
import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED; import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.graphics.Insets; import android.graphics.Insets;
import android.graphics.Matrix; import android.graphics.Matrix;
@ -54,6 +55,7 @@ import com.android.quickstep.views.TaskView;
import com.android.quickstep.views.TaskView.TaskIdAttributeContainer; import com.android.quickstep.views.TaskView.TaskIdAttributeContainer;
import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.recents.model.ThumbnailData;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -115,8 +117,9 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
* Does NOT add split options in the following scenarios: * Does NOT add split options in the following scenarios:
* * The taskView to add split options is already showing split screen tasks * * The taskView to add split options is already showing split screen tasks
* * There aren't at least 2 tasks in overview to show split options for * * There aren't at least 2 tasks in overview to show split options for
* * Device is in "Lock task mode"
* * The taskView to show split options for is the focused task AND we haven't started * * The taskView to show split options for is the focused task AND we haven't started
* scrolling in overview (if we haven't scrolled, there's a split overview action so * scrolling in overview (if we haven't scrolled, there's a split overview action button so
* we don't need this menu option) * we don't need this menu option)
*/ */
private static void addSplitOptions(List<SystemShortcut> outShortcuts, private static void addSplitOptions(List<SystemShortcut> outShortcuts,
@ -130,7 +133,11 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
boolean isFocusedTask = deviceProfile.overviewShowAsGrid && taskView.isFocusedTask(); boolean isFocusedTask = deviceProfile.overviewShowAsGrid && taskView.isFocusedTask();
boolean isTaskInExpectedScrollPosition = boolean isTaskInExpectedScrollPosition =
recentsView.isTaskInExpectedScrollPosition(recentsView.indexOfChild(taskView)); recentsView.isTaskInExpectedScrollPosition(recentsView.indexOfChild(taskView));
if (taskViewHasMultipleTasks || notEnoughTasksToSplit || ActivityManager activityManager =
(ActivityManager) taskView.getContext().getSystemService(Context.ACTIVITY_SERVICE);
boolean isLockTaskMode = activityManager.isInLockTaskMode();
if (taskViewHasMultipleTasks || notEnoughTasksToSplit || isLockTaskMode ||
(isFocusedTask && isTaskInExpectedScrollPosition)) { (isFocusedTask && isTaskInExpectedScrollPosition)) {
return; return;
} }

2
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@ -470,7 +470,9 @@ public class TaskView extends FrameLayout implements Reusable {
stubInfo.user = componentKey.user; stubInfo.user = componentKey.user;
stubInfo.intent = new Intent().setComponent(componentKey.componentName); stubInfo.intent = new Intent().setComponent(componentKey.componentName);
stubInfo.title = task.title; stubInfo.title = task.title;
if (getRecentsView() != null) {
stubInfo.screenId = getRecentsView().indexOfChild(this); stubInfo.screenId = getRecentsView().indexOfChild(this);
}
return stubInfo; return stubInfo;
} }