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

Commit d660f73a authored by Winson Chung's avatar Winson Chung
Browse files

Remove single task display path 

Test: atest TaskStackChangedListenerTest
Test: atest RecentTasksTest
Bug: 165794879
Change-Id: I4c86e58026be7bcbbd8a2568b396a281668b9385
parent ec72f999

api/test-current.txt

+1 −3
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void requestPictureInPictureMode(@NonNull android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizePrimarySplitScreen(@NonNull android.graphics.Rect, @NonNull android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizeTask(int, android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setDisplayToSingleTaskInstance(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean setTaskWindowingMode(int, int, boolean) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean setTaskWindowingModeSplitScreenPrimary(int, int, boolean, boolean, android.graphics.Rect, boolean) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void startSystemLockTaskMode(int);
@@ -163,7 +162,7 @@ package android.app { 
  public class ActivityView extends android.view.ViewGroup {

    ctor public ActivityView(android.content.Context);

    ctor public ActivityView(android.content.Context, android.util.AttributeSet);

    ctor public ActivityView(@NonNull android.content.Context, @NonNull android.util.AttributeSet, int, boolean, boolean);

    ctor public ActivityView(@NonNull android.content.Context, @NonNull android.util.AttributeSet, int, boolean);

    method public int getVirtualDisplayId();

    method public void onLayout(boolean, int, int, int, int);

    method public void onLocationChanged();
@@ -183,7 +182,6 @@ package android.app { 
    method @NonNull public android.app.ActivityView.Builder setAttributeSet(@Nullable android.util.AttributeSet);

    method @NonNull public android.app.ActivityView.Builder setDefaultStyle(int);

    method @NonNull public android.app.ActivityView.Builder setDisableSurfaceViewBackgroundLayer(boolean);

    method @NonNull public android.app.ActivityView.Builder setSingleInstance(boolean);

    method @NonNull public android.app.ActivityView.Builder setUsePublicVirtualDisplay(boolean);

    method @NonNull public android.app.ActivityView.Builder setUseTrustedDisplay(boolean);

  }

core/java/android/app/ActivityTaskManager.java

+0 −13
Original line number Diff line number Diff line
@@ -405,19 +405,6 @@ public class ActivityTaskManager { 
        }

    }



    /**

     * Makes the display with the given id a single task instance display. I.e the display can only

     * contain one task.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    public void setDisplayToSingleTaskInstance(int displayId) {

        try {

            getService().setDisplayToSingleTaskInstance(displayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Requests that an activity should enter picture-in-picture mode if possible.

     * @hide

core/java/android/app/ActivityView.java

+9 −20
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
    }



    public ActivityView(Context context, AttributeSet attrs) {

        this(context, attrs, 0 /* defStyle */, false /* singleTaskInstance */,

                false /* usePublicVirtualDisplay */,

        this(context, attrs, 0 /* defStyle */, false /* usePublicVirtualDisplay */,

                false /* disableSurfaceViewBackgroundLayer */, false /* useTrustedDisplay */);

    }
@@ -97,22 +96,21 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
     */

    public ActivityView(

            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay) {

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,

                false /* disableSurfaceViewBackgroundLayer */,

                false /* useTrustedDisplay */);

            boolean usePublicVirtualDisplay) {

        this(context, attrs, defStyle, usePublicVirtualDisplay,

                false /* disableSurfaceViewBackgroundLayer */, false /* useTrustedDisplay */);

    }



    private ActivityView(

            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean disableSurfaceViewBackgroundLayer, boolean useTrustedDisplay) {

            boolean usePublicVirtualDisplay, boolean disableSurfaceViewBackgroundLayer,

            boolean useTrustedDisplay) {

        super(context, attrs, defStyle);

        if (useTaskOrganizer()) {

            mTaskEmbedder = new TaskOrganizerTaskEmbedder(context, this);

        } else {

            mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, singleTaskInstance,

                    usePublicVirtualDisplay, useTrustedDisplay);

            mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, usePublicVirtualDisplay,

                    useTrustedDisplay);

        }

        mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer);

        // Since ActivityView#getAlpha has been overridden, we should use parent class's alpha
@@ -641,7 +639,6 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
        private final Context mContext;

        private AttributeSet mAttrs;

        private int mDefStyle;

        private boolean mSingleInstance;

        private boolean mUsePublicVirtualDisplay;

        private boolean mDisableSurfaceViewBackgroundLayer;

        private boolean mUseTrustedDisplay;
@@ -650,7 +647,6 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
            mContext = context;

            mAttrs = null;

            mDefStyle = 0;

            mSingleInstance = false;

            mUsePublicVirtualDisplay = false;

            mDisableSurfaceViewBackgroundLayer = false;

            mUseTrustedDisplay = false;
@@ -676,13 +672,6 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
            return this;

        }



        /** Sets to {@code true} to make the {@link ActivityView} single instance. */

        @NonNull

        public Builder setSingleInstance(boolean singleInstance) {

            mSingleInstance = singleInstance;

            return this;

        }



        /**

         * Sets to {@code true} to use public virtual display for the {@link ActivityView}.

         * <p>
@@ -722,7 +711,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
        /** Creates an {@link ActivityView} */

        @NonNull

        public ActivityView build() {

            return new ActivityView(mContext, mAttrs, mDefStyle, mSingleInstance,

            return new ActivityView(mContext, mAttrs, mDefStyle,

                    mUsePublicVirtualDisplay, mDisableSurfaceViewBackgroundLayer,

                    mUseTrustedDisplay);

        }

core/java/android/app/IActivityTaskManager.aidl

+0 −6
Original line number Diff line number Diff line
@@ -433,12 +433,6 @@ interface IActivityTaskManager { 
     */

    void clearLaunchParamsForPackages(in List<String> packageNames);



    /**

     * Makes the display with the given id a single task instance display. I.e the display can only

     * contain one task.

     */

    void setDisplayToSingleTaskInstance(int displayId);



    /**

     * Restarts the activity by killing its process if it is visible. If the activity is not

     * visible, the activity will not be restarted immediately and just keep the activity record in

core/java/android/app/ITaskStackListener.aidl

+0 −15
Original line number Diff line number Diff line
@@ -163,21 +163,6 @@ oneway interface ITaskStackListener { 
     */

    void onBackPressedOnTaskRoot(in ActivityManager.RunningTaskInfo taskInfo);



    /*

     * Called when contents are drawn for the first time on a display which can only contain one

     * task.

     *

     * @param displayId the id of the display on which contents are drawn.

     */

    void onSingleTaskDisplayDrawn(int displayId);



    /*

     * Called when the last task is removed from a display which can only contain one task.

     *

     * @param displayId the id of the display from which the window is removed.

     */

    void onSingleTaskDisplayEmpty(int displayId);



    /**

     * Called when a task is reparented to a stack on a different display.

     *