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

Commit 68221b01 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup the legacy split screen (1/n)"

parents 2888d659 03e4a848

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

+0 −6
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ import static android.app.WaitResult.LAUNCH_STATE_WARM; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;



import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ACTIVITY_START;
@@ -483,10 +481,6 @@ class ActivityMetricsLogger { 
            case WINDOWING_MODE_FULLSCREEN:

                mWindowState = WINDOW_STATE_STANDARD;

                break;

            case WINDOWING_MODE_SPLIT_SCREEN_PRIMARY:

            case WINDOWING_MODE_SPLIT_SCREEN_SECONDARY:

                mWindowState = WINDOW_STATE_SIDE_BY_SIDE;

                break;

            case WINDOWING_MODE_FREEFORM:

                mWindowState = WINDOW_STATE_FREEFORM;

                break;

services/core/java/com/android/server/wm/ActivityStarter.java

+0 −23
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import static android.app.ActivityManager.START_SUCCESS; 
import static android.app.ActivityManager.START_TASK_TO_FRONT;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
@@ -1926,27 +1924,6 @@ class ActivityStarter { 


    private void computeLaunchParams(ActivityRecord r, ActivityRecord sourceRecord,

            Task targetTask) {

        final Task sourceRootTask = mSourceRootTask != null ? mSourceRootTask

                : mRootWindowContainer.getTopDisplayFocusedRootTask();

        if (sourceRootTask != null && sourceRootTask.inSplitScreenWindowingMode()

                && (mOptions == null

                        || mOptions.getLaunchWindowingMode() == WINDOWING_MODE_UNDEFINED)) {

            int windowingMode =

                    targetTask != null ? targetTask.getWindowingMode() : WINDOWING_MODE_UNDEFINED;

            if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0) {

                if (sourceRootTask.inSplitScreenPrimaryWindowingMode()) {

                    windowingMode = WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

                } else if (sourceRootTask.inSplitScreenSecondaryWindowingMode()) {

                    windowingMode = WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

                }

            }



            if (mOptions == null) {

                mOptions = ActivityOptions.makeBasic();

            }

            mOptions.setLaunchWindowingMode(windowingMode);

        }



        mSupervisor.getLaunchParamsController().calculate(targetTask, r.info.windowLayout, r,

                sourceRecord, mOptions, mRequest, PHASE_BOUNDS, mLaunchParams);

        mPreferredTaskDisplayArea = mLaunchParams.hasPreferredTaskDisplayArea()

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+3 −9
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.pm.PackageManager.NOTIFY_PACKAGE_USE_ACTIVITY;

import static android.content.pm.PackageManager.PERMISSION_DENIED;
@@ -2199,10 +2198,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
            boolean forceNonResizable) {

        final boolean isSecondaryDisplayPreferred = preferredTaskDisplayArea != null

                && preferredTaskDisplayArea.getDisplayId() != DEFAULT_DISPLAY;

        final boolean inSplitScreenMode = actualRootTask != null

                && actualRootTask.getDisplayArea().isSplitScreenModeActivated();

        if (((!inSplitScreenMode && preferredWindowingMode != WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)

                && !isSecondaryDisplayPreferred) || !task.isActivityTypeStandardOrUndefined()) {

        if (!task.isActivityTypeStandardOrUndefined()) {

            return;

        }
@@ -2543,10 +2539,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
                                == PERMISSION_GRANTED) {

                    mRecentTasks.setFreezeTaskListReordering();

                }

                if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY

                        || activityOptions.getLaunchRootTask() != null) {

                    // Don't move home activity forward if we are launching into primary split or

                    // there is a launch root set.

                if (activityOptions.getLaunchRootTask() != null) {

                    // Don't move home activity forward if there is a launch root set.

                    moveHomeTaskForward = false;

                }

            }

services/core/java/com/android/server/wm/DisplayPolicy.java

+2 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm; 


import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.view.Display.TYPE_INTERNAL;

import static android.view.InsetsState.ITYPE_BOTTOM_MANDATORY_GESTURES;

import static android.view.InsetsState.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
@@ -1719,8 +1718,7 @@ public class DisplayPolicy { 
                // and mTopIsFullscreen is that mTopIsFullscreen is set only if the window

                // requests to hide the status bar.  Not sure if there is another way that to be the

                // case though.

                if (!topIsFullscreen || mDisplayContent.getDefaultTaskDisplayArea()

                        .isRootTaskVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)) {

                if (!topIsFullscreen) {

                    topAppHidesStatusBar = false;

                }

            }
@@ -2427,8 +2425,7 @@ public class DisplayPolicy { 
    private int updateSystemBarsLw(WindowState win, int disableFlags) {

        final TaskDisplayArea defaultTaskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea();

        final boolean multiWindowTaskVisible =

                defaultTaskDisplayArea.isRootTaskVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)

                        || defaultTaskDisplayArea.isRootTaskVisible(WINDOWING_MODE_MULTI_WINDOW);

                defaultTaskDisplayArea.isRootTaskVisible(WINDOWING_MODE_MULTI_WINDOW);

        final boolean freeformRootTaskVisible =

                defaultTaskDisplayArea.isRootTaskVisible(WINDOWING_MODE_FREEFORM);

services/core/java/com/android/server/wm/RecentTasks.java

+0 −11
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
@@ -1370,16 +1369,6 @@ class RecentTasks { 
        switch (task.getWindowingMode()) {

            case WINDOWING_MODE_PINNED:

                return false;

            case WINDOWING_MODE_SPLIT_SCREEN_PRIMARY:

                if (DEBUG_RECENTS_TRIM_TASKS) {

                    Slog.d(TAG, "\ttop=" + task.getRootTask().getTopMostTask());

                }

                final Task rootTask = task.getRootTask();

                if (rootTask != null && rootTask.getTopMostTask() == task) {

                    // Only the non-top task of the primary split screen mode is visible

                    return false;

                }

                break;

            case WINDOWING_MODE_MULTI_WINDOW:

                // Ignore tasks that are always on top

                if (task.isAlwaysOnTopWhenVisible()) {