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

Commit 8ee33e64 authored by Jeremy Sim's avatar Jeremy Sim Committed by Android (Google) Code Review
Browse files

Merge "Revert "When resizing split and both sides are veiled, make sure both... 

Merge "Revert "When resizing split and both sides are veiled, make sure both sides are veiled with the same color"" into main
parents 73e18a8c 25ae3aec

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java

+9 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.animation.ValueAnimator; 
import android.app.ActivityManager;

import android.content.Context;

import android.content.res.Configuration;

import android.graphics.Color;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;
@@ -201,7 +202,7 @@ public class SplitDecorManager extends WindowlessWindowManager { 
    /** Showing resizing hint. */

    public void onResizing(ActivityManager.RunningTaskInfo resizingTask, Rect newBounds,

            Rect sideBounds, SurfaceControl.Transaction t, int offsetX, int offsetY,

            boolean immediately, float[] veilColor) {

            boolean immediately) {

        if (mResizingIconView == null) {

            return;

        }
@@ -234,7 +235,7 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        if (mBackgroundLeash == null) {

            mBackgroundLeash = SurfaceUtils.makeColorLayer(mHostLeash,

                    RESIZING_BACKGROUND_SURFACE_NAME, mSurfaceSession);

            t.setColor(mBackgroundLeash, veilColor)

            t.setColor(mBackgroundLeash, getResizingBackgroundColor(resizingTask))

                    .setLayer(mBackgroundLeash, Integer.MAX_VALUE - 1);

        }
@@ -245,7 +246,7 @@ public class SplitDecorManager extends WindowlessWindowManager { 
            mGapBackgroundLeash = SurfaceUtils.makeColorLayer(mHostLeash,

                    GAP_BACKGROUND_SURFACE_NAME, mSurfaceSession);

            // Fill up another side bounds area.

            t.setColor(mGapBackgroundLeash, veilColor)

            t.setColor(mGapBackgroundLeash, getResizingBackgroundColor(resizingTask))

                    .setLayer(mGapBackgroundLeash, Integer.MAX_VALUE - 2)

                    .setPosition(mGapBackgroundLeash, left, top)

                    .setWindowCrop(mGapBackgroundLeash, sideBounds.width(), sideBounds.height());
@@ -486,4 +487,9 @@ public class SplitDecorManager extends WindowlessWindowManager { 
            mIcon = null;

        }

    }



    private static float[] getResizingBackgroundColor(ActivityManager.RunningTaskInfo taskInfo) {

        final int taskBgColor = taskInfo.taskDescription.getBackgroundColor();

        return Color.valueOf(taskBgColor == -1 ? Color.WHITE : taskBgColor).getComponents();

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java

+10 −7
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.wm.shell.common.split;



import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_ALL_KINDS_WITH_ALL_PINNED;



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

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

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;
@@ -24,18 +26,25 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT 


import android.app.ActivityManager;

import android.app.PendingIntent;

import android.content.ComponentName;

import android.content.Intent;

import android.content.pm.LauncherApps;

import android.content.pm.ShortcutInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.Rect;

import android.os.UserHandle;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.util.ArrayUtils;

import com.android.wm.shell.Flags;

import com.android.wm.shell.ShellTaskOrganizer;



import java.util.Arrays;

import java.util.List;



/** Helper utility class for split screen components to use. */

public class SplitScreenUtils {

    /** Reverse the split position. */
@@ -128,10 +137,4 @@ public class SplitScreenUtils { 
            return isLandscape;

        }

    }



    /** Returns the specified background color that matches a RunningTaskInfo. */

    public static Color getResizingBackgroundColor(ActivityManager.RunningTaskInfo taskInfo) {

        final int taskBgColor = taskInfo.taskDescription.getBackgroundColor();

        return Color.valueOf(taskBgColor == -1 ? Color.WHITE : taskBgColor);

    }

}

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

+10 −4
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; 
import static android.content.pm.ActivityInfo.CONFIG_ASSETS_PATHS;

import static android.content.pm.ActivityInfo.CONFIG_UI_MODE;

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

import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME;

import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION;



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 static com.android.wm.shell.common.split.SplitScreenUtils.getResizingBackgroundColor;

import static com.android.wm.shell.draganddrop.DragAndDropPolicy.Target.TYPE_SPLIT_BOTTOM;

import static com.android.wm.shell.draganddrop.DragAndDropPolicy.Target.TYPE_SPLIT_LEFT;

import static com.android.wm.shell.draganddrop.DragAndDropPolicy.Target.TYPE_SPLIT_RIGHT;
@@ -40,6 +40,7 @@ import android.app.StatusBarManager; 
import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.Insets;

import android.graphics.Point;

import android.graphics.Rect;
@@ -290,7 +291,7 @@ public class DragLayout extends LinearLayout 
                final int activityType = taskInfo1.getActivityType();

                if (activityType == ACTIVITY_TYPE_STANDARD) {

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

                    int bgColor1 = getResizingBackgroundColor(taskInfo1).toArgb();

                    int bgColor1 = getResizingBackgroundColor(taskInfo1);

                    mDropZoneView1.setAppInfo(bgColor1, icon1);

                    mDropZoneView2.setAppInfo(bgColor1, icon1);

                    mDropZoneView1.setForceIgnoreBottomMargin(false);
@@ -312,10 +313,10 @@ public class DragLayout extends LinearLayout 
                    mSplitScreenController.getTaskInfo(SPLIT_POSITION_BOTTOM_OR_RIGHT);

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

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

                int topOrLeftColor = getResizingBackgroundColor(topOrLeftTask).toArgb();

                int topOrLeftColor = getResizingBackgroundColor(topOrLeftTask);

                Drawable bottomOrRightIcon = mIconProvider.getIcon(

                        bottomOrRightTask.topActivityInfo);

                int bottomOrRightColor = getResizingBackgroundColor(bottomOrRightTask).toArgb();

                int bottomOrRightColor = getResizingBackgroundColor(bottomOrRightTask);

                mDropZoneView1.setAppInfo(topOrLeftColor, topOrLeftIcon);

                mDropZoneView2.setAppInfo(bottomOrRightColor, bottomOrRightIcon);

            }
@@ -586,6 +587,11 @@ public class DragLayout extends LinearLayout 
        }

    }



    private static int getResizingBackgroundColor(ActivityManager.RunningTaskInfo taskInfo) {

        final int taskBgColor = taskInfo.taskDescription.getBackgroundColor();

        return Color.valueOf(taskBgColor == -1 ? Color.WHITE : taskBgColor).toArgb();

    }



    /**

     * Dumps information about this drag layout.

     */

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

+2 −8
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT 
import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;

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

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

import static com.android.wm.shell.common.split.SplitScreenUtils.getResizingBackgroundColor;

import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPosition;

import static com.android.wm.shell.common.split.SplitScreenUtils.splitFailureMessage;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN;
@@ -2458,13 +2457,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        updateSurfaceBounds(layout, t, shouldUseParallaxEffect);

        getMainStageBounds(mTempRect1);

        getSideStageBounds(mTempRect2);

        // TODO (b/307490004): "commonColor" below is a temporary fix to ensure the colors on both

        //  sides match. When b/307490004 is fixed, this code can be reverted.

        float[] commonColor = getResizingBackgroundColor(mSideStage.mRootTaskInfo).getComponents();

        mMainStage.onResizing(

                mTempRect1, mTempRect2, t, offsetX, offsetY, mShowDecorImmediately, commonColor);

        mSideStage.onResizing(

                mTempRect2, mTempRect1, t, offsetX, offsetY, mShowDecorImmediately, commonColor);

        mMainStage.onResizing(mTempRect1, mTempRect2, t, offsetX, offsetY, mShowDecorImmediately);

        mSideStage.onResizing(mTempRect2, mTempRect1, t, offsetX, offsetY, mShowDecorImmediately);

        t.apply();

        mTransactionPool.release(t);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -314,10 +314,10 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
    }



    void onResizing(Rect newBounds, Rect sideBounds, SurfaceControl.Transaction t, int offsetX,

            int offsetY, boolean immediately, float[] veilColor) {

            int offsetY, boolean immediately) {

        if (mSplitDecorManager != null && mRootTaskInfo != null) {

            mSplitDecorManager.onResizing(mRootTaskInfo, newBounds, sideBounds, t, offsetX,

                    offsetY, immediately, veilColor);

                    offsetY, immediately);

        }

    }