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

Merge "Hide split options for focused task." into sc-v2-dev

This commit is contained in:
Vinit Nayak 2021-09-24 17:18:02 +00:00 committed by Android (Google) Code Review
parent cc1e94a982 8df5833bc7
commit f2907c6ce3
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,9 +114,11 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
private static void addSplitOptions(List<SystemShortcut> outShortcuts,
BaseDraggingActivity activity, TaskView taskView, DeviceProfile deviceProfile) {
int[] taskViewTaskIds = taskView.getTaskIds();
boolean alreadyHasMultipleTasks = taskViewTaskIds[0] != -1 &&
boolean taskViewHasMultipleTasks = taskViewTaskIds[0] != -1 &&
taskViewTaskIds[1] != -1;
if (alreadyHasMultipleTasks) {
boolean notEnoughTasksToSplit = taskView.getRecentsView().getTaskViewCount() < 2;
if (taskViewHasMultipleTasks || notEnoughTasksToSplit ||
(deviceProfile.overviewShowAsGrid && taskView.isFocusedTask())) {
return;
}

16
quickstep/src/com/android/quickstep/TaskShortcutFactory.java
View File

@ -35,7 +35,6 @@ import android.window.SplashScreen;
import com.android.launcher3.BaseDraggingActivity;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.R;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
import com.android.launcher3.model.WellbeingModel;
import com.android.launcher3.popup.SystemShortcut;
@ -115,13 +114,12 @@ public interface TaskShortcutFactory {
class SplitSelectSystemShortcut extends SystemShortcut {
private final TaskView mTaskView;
private SplitPositionOption mSplitPositionOption;
private final SplitPositionOption mSplitPositionOption;
public SplitSelectSystemShortcut(BaseDraggingActivity target, TaskView taskView,
SplitPositionOption option) {
super(option.iconResId, option.textResId, target, taskView.getItemInfo());
mTaskView = taskView;
mSplitPositionOption = option;
setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);
}
@Override
@ -251,18 +249,6 @@ public interface TaskShortcutFactory {
&& (displayId == -1 || displayId == DEFAULT_DISPLAY);
}
@Override
public SystemShortcut getShortcut(BaseDraggingActivity activity,
TaskIdAttributeContainer taskContainer) {
SystemShortcut shortcut = super.getShortcut(activity, taskContainer);
if (shortcut != null && FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
// Disable if there's only one recent app for split screen
shortcut.setEnabled(taskContainer.getTaskView().
getRecentsView().getTaskViewCount() > 1);
}
return shortcut;
}
@Override
protected ActivityOptions makeLaunchOptions(Activity activity) {
final ActivityCompat act = new ActivityCompat(activity);

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

@ -3162,7 +3162,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
return;
}
mActionsView.setSplitButtonVisible(
mActivity.getDeviceProfile().isTablet && getTaskViewCount() > 1);
mActivity.getDeviceProfile().overviewShowAsGrid && getTaskViewCount() > 1);
}
/**

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

@ -242,8 +242,6 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp,
menuOptionView, mActivity.getDeviceProfile());
menuOptionView.setEnabled(menuOption.isEnabled());
menuOptionView.setAlpha(menuOption.isEnabled() ? 1 : 0.5f);
menuOptionView.setOnClickListener(menuOption::onClick);
mOptionLayout.addView(menuOptionView);
}