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

Commit 90db2335 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge changes I3c7a2886,Ib959f44b into sc-v2-dev 

* changes:
  Update dropzones to match the size of the existing split
  Fix how task info is retrieved for split screen
parents 6a63b739 c57aa4a8

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropPolicy.java

+14 −3
Original line number Diff line number Diff line
@@ -151,7 +151,13 @@ public class DragAndDropPolicy { 
                final Rect rightHitRegion = new Rect();

                final Rect rightDrawRegion = bottomOrRightBounds;



                // If we have existing split regions use those bounds, otherwise split it 50/50

                if (inSplitScreen) {

                    leftHitRegion.set(topOrLeftBounds);

                    rightHitRegion.set(bottomOrRightBounds);

                } else {

                    displayRegion.splitVertically(leftHitRegion, rightHitRegion);

                }



                mTargets.add(new Target(TYPE_SPLIT_LEFT, leftHitRegion, leftDrawRegion));

                mTargets.add(new Target(TYPE_SPLIT_RIGHT, rightHitRegion, rightDrawRegion));
@@ -162,8 +168,13 @@ public class DragAndDropPolicy { 
                final Rect bottomHitRegion = new Rect();

                final Rect bottomDrawRegion = bottomOrRightBounds;



                displayRegion.splitHorizontally(

                        topHitRegion, bottomHitRegion);

                // If we have existing split regions use those bounds, otherwise split it 50/50

                if (inSplitScreen) {

                    topHitRegion.set(topOrLeftBounds);

                    bottomHitRegion.set(bottomOrRightBounds);

                } else {

                    displayRegion.splitHorizontally(topHitRegion, bottomHitRegion);

                }



                mTargets.add(new Target(TYPE_SPLIT_TOP, topHitRegion, topDrawRegion));

                mTargets.add(new Target(TYPE_SPLIT_BOTTOM, bottomHitRegion, bottomDrawRegion));

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java

+80 −37
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
package com.android.wm.shell.draganddrop;



import static android.app.StatusBarManager.DISABLE_NONE;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;



import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;



import android.animation.Animator;
@@ -32,11 +34,11 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.graphics.Color;

import android.graphics.Insets;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.RemoteException;

import android.view.DragEvent;

import android.view.SurfaceControl;

import android.view.ViewGroup;

import android.view.WindowInsets;

import android.view.WindowInsets.Type;

import android.widget.LinearLayout;
@@ -73,6 +75,7 @@ public class DragLayout extends LinearLayout { 
    private DropZoneView mDropZoneView2;



    private int mDisplayMargin;

    private int mDividerSize;

    private Insets mInsets = Insets.NONE;



    private boolean mIsShowing;
@@ -89,13 +92,15 @@ public class DragLayout extends LinearLayout { 


        mDisplayMargin = context.getResources().getDimensionPixelSize(

                R.dimen.drop_layout_display_margin);

        mDividerSize = context.getResources().getDimensionPixelSize(

                R.dimen.split_divider_bar_width);



        mDropZoneView1 = new DropZoneView(context);

        mDropZoneView2 = new DropZoneView(context);

        addView(mDropZoneView1, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT));

        addView(mDropZoneView2, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT));

        addView(mDropZoneView1, new LinearLayout.LayoutParams(MATCH_PARENT,

                MATCH_PARENT));

        addView(mDropZoneView2, new LinearLayout.LayoutParams(MATCH_PARENT,

                MATCH_PARENT));

        ((LayoutParams) mDropZoneView1.getLayoutParams()).weight = 1;

        ((LayoutParams) mDropZoneView2.getLayoutParams()).weight = 1;

        updateContainerMargins();
@@ -165,10 +170,13 @@ public class DragLayout extends LinearLayout { 
        mHasDropped = false;

        mCurrentTarget = null;



        boolean alreadyInSplit = mSplitScreenController != null

                && mSplitScreenController.isSplitScreenVisible();

        if (!alreadyInSplit) {

            List<ActivityManager.RunningTaskInfo> tasks = null;

        // Figure out the splashscreen info for the existing task(s).

            // Figure out the splashscreen info for the existing task.

            try {

            tasks = ActivityTaskManager.getService().getTasks(2,

                tasks = ActivityTaskManager.getService().getTasks(1,

                        false /* filterOnlyVisibleRecents */,

                        false /* keepIntentExtra */);

            } catch (RemoteException e) {
@@ -178,29 +186,64 @@ public class DragLayout extends LinearLayout { 
                ActivityManager.RunningTaskInfo taskInfo1 = tasks.get(0);

                Drawable icon1 = mIconProvider.getIcon(taskInfo1.topActivityInfo);

                int bgColor1 = getResizingBackgroundColor(taskInfo1);



            boolean alreadyInSplit = mSplitScreenController != null

                    && mSplitScreenController.isSplitScreenVisible();

            if (alreadyInSplit && tasks.size() > 1) {

                ActivityManager.RunningTaskInfo taskInfo2 = tasks.get(1);

                Drawable icon2 = mIconProvider.getIcon(taskInfo2.topActivityInfo);

                int bgColor2 = getResizingBackgroundColor(taskInfo2);



                // figure out which task is on which side

                int splitPosition1 = mSplitScreenController.getSplitPosition(taskInfo1.taskId);

                boolean isTask1TopOrLeft = splitPosition1 == SPLIT_POSITION_TOP_OR_LEFT;

                if (isTask1TopOrLeft) {

                mDropZoneView1.setAppInfo(bgColor1, icon1);

                    mDropZoneView2.setAppInfo(bgColor2, icon2);

                } else {

                mDropZoneView2.setAppInfo(bgColor1, icon1);

                    mDropZoneView1.setAppInfo(bgColor2, icon2);

                updateDropZoneSizes(null, null); // passing null splits the views evenly

            }

        } else {

                mDropZoneView1.setAppInfo(bgColor1, icon1);

                mDropZoneView2.setAppInfo(bgColor1, icon1);

            // We're already in split so get taskInfo from the controller to populate icon / color.

            ActivityManager.RunningTaskInfo topOrLeftTask =

                    mSplitScreenController.getTaskInfo(SPLIT_POSITION_TOP_OR_LEFT);

            ActivityManager.RunningTaskInfo bottomOrRightTask =

                    mSplitScreenController.getTaskInfo(SPLIT_POSITION_BOTTOM_OR_RIGHT);

            if (topOrLeftTask != null && bottomOrRightTask != null) {

                Drawable topOrLeftIcon = mIconProvider.getIcon(topOrLeftTask.topActivityInfo);

                int topOrLeftColor = getResizingBackgroundColor(topOrLeftTask);

                Drawable bottomOrRightIcon = mIconProvider.getIcon(

                        bottomOrRightTask.topActivityInfo);

                int bottomOrRightColor = getResizingBackgroundColor(bottomOrRightTask);

                mDropZoneView1.setAppInfo(topOrLeftColor, topOrLeftIcon);

                mDropZoneView2.setAppInfo(bottomOrRightColor, bottomOrRightIcon);

            }



            // Update the dropzones to match existing split sizes

            Rect topOrLeftBounds = new Rect();

            Rect bottomOrRightBounds = new Rect();

            mSplitScreenController.getStageBounds(topOrLeftBounds, bottomOrRightBounds);

            updateDropZoneSizes(topOrLeftBounds, bottomOrRightBounds);

        }

    }



    /**

     * Sets the size of the two drop zones based on the provided bounds. The divider sits between

     * the views and its size is included in the calculations.

     *

     * @param bounds1 bounds to apply to the first dropzone view, null if split in half.

     * @param bounds2 bounds to apply to the second dropzone view, null if split in half.

     */

    private void updateDropZoneSizes(Rect bounds1, Rect bounds2) {

        final int orientation = getResources().getConfiguration().orientation;

        final boolean isPortrait = orientation == Configuration.ORIENTATION_PORTRAIT;

        final int halfDivider = mDividerSize / 2;

        final LinearLayout.LayoutParams dropZoneView1 =

                (LayoutParams) mDropZoneView1.getLayoutParams();

        final LinearLayout.LayoutParams dropZoneView2 =

                (LayoutParams) mDropZoneView2.getLayoutParams();

        if (isPortrait) {

            dropZoneView1.width = MATCH_PARENT;

            dropZoneView2.width = MATCH_PARENT;

            dropZoneView1.height = bounds1 != null ? bounds1.height() + halfDivider : MATCH_PARENT;

            dropZoneView2.height = bounds2 != null ? bounds2.height() + halfDivider : MATCH_PARENT;

        } else {

            dropZoneView1.width = bounds1 != null ? bounds1.width() + halfDivider : MATCH_PARENT;

            dropZoneView2.width = bounds2 != null ? bounds2.width() + halfDivider : MATCH_PARENT;

            dropZoneView1.height = MATCH_PARENT;

            dropZoneView2.height = MATCH_PARENT;

        }

        dropZoneView1.weight = bounds1 != null ? 0 : 1;

        dropZoneView2.weight = bounds2 != null ? 0 : 1;

        mDropZoneView1.setLayoutParams(dropZoneView1);

        mDropZoneView2.setLayoutParams(dropZoneView2);

    }



    public void show() {

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+9 −0
Original line number Diff line number Diff line
@@ -186,6 +186,15 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        return mStageCoordinator.isSplitScreenVisible();

    }



    @Nullable

    public ActivityManager.RunningTaskInfo getTaskInfo(@SplitPosition int splitPosition) {

        if (isSplitScreenVisible()) {

            int taskId = mStageCoordinator.getTaskId(splitPosition);

            return mTaskOrganizer.getRunningTaskInfo(taskId);

        }

        return null;

    }



    public boolean isTaskInSplitScreen(int taskId) {

        return isSplitScreenVisible()

                && mStageCoordinator.getStageOfTask(taskId) != STAGE_TYPE_UNDEFINED;

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+8 −0
Original line number Diff line number Diff line
@@ -522,6 +522,14 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        return SplitLayout.reversePosition(mSideStagePosition);

    }



    int getTaskId(@SplitPosition int splitPosition) {

        if (mSideStagePosition == splitPosition) {

            return mSideStage.getTopVisibleChildTaskId();

        } else {

            return mMainStage.getTopVisibleChildTaskId();

        }

    }



    void setSideStagePosition(@SplitPosition int sideStagePosition,

            @Nullable WindowContainerTransaction wct) {

        setSideStagePosition(sideStagePosition, true /* updateBounds */, wct);