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

Commit 4c0797b1 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge changes I047de19b,I5c656d7a into main 

* changes:
  Only use DefaultMixedHandler for recents when desktop tasks are visible
  Update desktop task corner size to spec
parents df3bcae6 17186ff3

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

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


package com.android.wm.shell.desktopmode



import android.R

import android.app.ActivityManager.RunningTaskInfo

import android.app.WindowConfiguration

import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME
@@ -27,7 +26,6 @@ import android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW 
import android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED

import android.app.WindowConfiguration.WindowingMode

import android.content.Context

import android.content.res.TypedArray

import android.graphics.Point

import android.graphics.PointF

import android.graphics.Rect
@@ -44,6 +42,7 @@ import android.window.TransitionInfo 
import android.window.TransitionRequestInfo

import android.window.WindowContainerTransaction

import androidx.annotation.BinderThread

import com.android.internal.policy.ScreenDecorationsUtils

import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.common.DisplayController
@@ -696,10 +695,7 @@ class DesktopTasksController( 
            finishTransaction: SurfaceControl.Transaction

    ) {

        // Add rounded corners to freeform windows

        val ta: TypedArray = context.obtainStyledAttributes(

                intArrayOf(R.attr.dialogCornerRadius))

        val cornerRadius = ta.getDimensionPixelSize(0, 0).toFloat()

        ta.recycle()

        val cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context)

        info.changes

                .filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM }

                .forEach { finishTransaction.setCornerRadius(it.leash, cornerRadius) }

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+9 −5
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.wm.shell.transition; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;



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

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

import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA;
@@ -239,9 +239,14 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 


    @Override

    public Transitions.TransitionHandler handleRecentsRequest(WindowContainerTransaction outWCT) {

        if (mRecentsHandler != null && (mSplitHandler.isSplitScreenVisible()

                || DesktopModeStatus.isEnabled())) {

        if (mRecentsHandler != null) {

            if (mSplitHandler.isSplitScreenVisible()) {

                return this;

            } else if (mDesktopTasksController != null

                    // Check on the default display. Recents/gesture nav is only available there

                    && mDesktopTasksController.getVisibleTaskCount(DEFAULT_DISPLAY) > 0) {

                return this;

            }

        }

        return null;

    }
@@ -662,7 +667,6 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
        if (!consumed) {

            return false;

        }

        //Sync desktop mode state (proto 2)

        if (mDesktopTasksController != null) {

            mDesktopTasksController.syncSurfaceState(info, finishTransaction);

            return true;