Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df5833b authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Hide split options for focused task. 

Fixes: 197245395
Test: Tap app icon on focused task,
no split options.

Change-Id: I329ee3d6e911c16ba2f3b265e2eb42466369df28
parent e37b51b3

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

+4 −2
Original line number Diff line number Diff line
@@ -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;

        }

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

+1 −15
Original line number Diff line number Diff line
@@ -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);

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }



    /**

quickstep/src/com/android/quickstep/views/TaskMenuView.java

+0 −2
Original line number Diff line number Diff line
@@ -243,8 +243,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);

    }