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

Commit fa3aaa18 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

[CD] Fix predictive back system anims partially run on wrong display 

Bug: 382774299
Test: Manual, i.e. verified that predictive back system animations do
      not add background/scrim windows on the wrong display.
Flag: com.android.window.flags.enable_multidisplay_trackpad_back_gesture
Change-Id: I833a7d93c5fe30287cb8ec2bf0b4eea803a659a1
parent 8102154d

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationBackground.java

+10 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.wm.shell.back; 
import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;



import static com.android.window.flags.Flags.enableMultidisplayTrackpadBackGesture;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.graphics.Color;
@@ -59,9 +61,9 @@ public class BackAnimationBackground { 
     * @param statusbarHeight The height of the statusbar (in px).

     */

    public void ensureBackground(Rect startRect, int color,

            @NonNull SurfaceControl.Transaction transaction, int statusbarHeight) {

            @NonNull SurfaceControl.Transaction transaction, int statusbarHeight, int displayId) {

        ensureBackground(startRect, color, transaction, statusbarHeight,

                null /* cropBounds */, 0 /* cornerRadius */);

                null /* cropBounds */, 0 /* cornerRadius */, displayId);

    }



    /**
@@ -76,7 +78,7 @@ public class BackAnimationBackground { 
     */

    public void ensureBackground(Rect startRect, int color,

            @NonNull SurfaceControl.Transaction transaction, int statusbarHeight,

            @Nullable Rect cropBounds, float cornerRadius) {

            @Nullable Rect cropBounds, float cornerRadius, int displayId) {

        if (mBackgroundSurface != null) {

            return;

        }
@@ -91,7 +93,11 @@ public class BackAnimationBackground { 
                .setCallsite("BackAnimationBackground")

                .setColorLayer();



        if (enableMultidisplayTrackpadBackGesture()) {

            mRootTaskDisplayAreaOrganizer.attachToDisplayArea(displayId, colorLayerBuilder);

        } else {

            mRootTaskDisplayAreaOrganizer.attachToDisplayArea(DEFAULT_DISPLAY, colorLayerBuilder);

        }

        mBackgroundSurface = colorLayerBuilder.build();

        transaction.setColor(mBackgroundSurface, colorComponents)

                .setLayer(mBackgroundSurface, BACKGROUND_LAYER)

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt

+16 −3
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.internal.jank.Cuj 
import com.android.internal.policy.ScreenDecorationsUtils

import com.android.internal.policy.SystemBarUtils

import com.android.internal.protolog.ProtoLog

import com.android.window.flags.Flags.enableMultidisplayTrackpadBackGesture

import com.android.window.flags.Flags.predictiveBackTimestampApi

import com.android.wm.shell.R

import com.android.wm.shell.RootTaskDisplayAreaOrganizer
@@ -210,7 +211,8 @@ abstract class CrossActivityBackAnimation( 
                statusbarHeight,

                if (closingTarget!!.windowConfiguration.tasksAreFloating())

                    closingTarget!!.localBounds else null,

                cornerRadius

                cornerRadius,

                closingTarget!!.taskInfo.getDisplayId()

        )

        ensureScrimLayer()

        if (isLetterboxed && enteringHasSameLetterbox) {
@@ -409,7 +411,12 @@ abstract class CrossActivityBackAnimation( 
                .setOpaque(false)

                .setHidden(false)



        if (enableMultidisplayTrackpadBackGesture()) {

            rootTaskDisplayAreaOrganizer.attachToDisplayArea(

                closingTarget!!.taskInfo.getDisplayId(), scrimBuilder)

        } else {

            rootTaskDisplayAreaOrganizer.attachToDisplayArea(Display.DEFAULT_DISPLAY, scrimBuilder)

        }

        scrimLayer = scrimBuilder.build()

        val colorComponents = floatArrayOf(0f, 0f, 0f)

        maxScrimAlpha = if (isDarkTheme) MAX_SCRIM_ALPHA_DARK else MAX_SCRIM_ALPHA_LIGHT
@@ -473,7 +480,13 @@ abstract class CrossActivityBackAnimation( 
                .setOpaque(true)

                .setHidden(false)



        rootTaskDisplayAreaOrganizer.attachToDisplayArea(Display.DEFAULT_DISPLAY, letterboxBuilder)

        if (enableMultidisplayTrackpadBackGesture()) {

            rootTaskDisplayAreaOrganizer.attachToDisplayArea(

                closingTarget!!.taskInfo.getDisplayId(), letterboxBuilder)

        } else {

            rootTaskDisplayAreaOrganizer.attachToDisplayArea(

                Display.DEFAULT_DISPLAY, letterboxBuilder)

        }

        val layer = letterboxBuilder.build()

        val colorComponents =

            floatArrayOf(

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ public class CrossTaskBackAnimation extends ShellBackAnimation { 


        // Draw background.

        mBackground.ensureBackground(mClosingTarget.windowConfiguration.getBounds(),

                BACKGROUNDCOLOR, mTransaction, mStatusbarHeight);

                BACKGROUNDCOLOR, mTransaction, mStatusbarHeight,

                mClosingTarget.taskInfo.getDisplayId());

        mInterWindowMargin = mContext.getResources()

                .getDimension(R.dimen.cross_task_back_inter_window_margin);

        mVerticalMargin = mContext.getResources()