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

Commit be418293 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix issues with z-ordering during animations 

- Make sure to use DC pending transaction when updating z-layers,
as it could lead to reordering of z-order assignment due to how
we apply pending transactions in the hierarchy

- Create a separate boosted animation layer in which AWT with
zOrder=top animate, which happens above all stack. This brings
back the boosting logic in O without boosting non-boosted stack
above non-animating tokens

Bug: 70730519
Bug: 72649981
Bug: 72686618
Bug: 37953606
Test: Share link from Chrome to Clipboard, make sure disappear
animation happens properly
Test: go/wm-smoke
Change-Id: I3957daac76b991402bf3f520c4a3d3f519933f72
parent c6d9f7ce

services/core/java/com/android/server/wm/AppWindowToken.java

+5 −1
Original line number Diff line number Diff line
@@ -1660,6 +1660,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
                true /* topToBottom */);

    }



    SurfaceControl getAppAnimationLayer() {

        return getAppAnimationLayer(needsZBoost());

    }



    @Override

    public SurfaceControl getAnimationLeashParent() {

        // All normal app transitions take place in an animation layer which is below the pinned
@@ -1855,7 +1859,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        leash.setLayer(layer);



        final DisplayContent dc = getDisplayContent();

        dc.assignStackOrdering(t);

        dc.assignStackOrdering();

        if (mAnimatingAppWindowTokenRegistry != null) {

            mAnimatingAppWindowTokenRegistry.notifyStarting(this);

        }

services/core/java/com/android/server/wm/DisplayContent.java

+19 −4
Original line number Diff line number Diff line
@@ -3172,6 +3172,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
         * A control placed at the appropriate level for transitions to occur.

         */

        SurfaceControl mAppAnimationLayer = null;

        SurfaceControl mBoostedAppAnimationLayer = null;



        /**

         * Given that the split-screen divider does not have an AppWindowToken, it
@@ -3523,12 +3524,14 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        }



        void assignStackOrdering(SurfaceControl.Transaction t) {



            final int HOME_STACK_STATE = 0;

            final int NORMAL_STACK_STATE = 1;

            final int ALWAYS_ON_TOP_STATE = 2;



            int layer = 0;

            int layerForAnimationLayer = 0;

            int layerForBoostedAnimationLayer = 0;



            for (int state = 0; state <= ALWAYS_ON_TOP_STATE; state++) {

                for (int i = 0; i < mChildren.size(); i++) {
@@ -3550,16 +3553,22 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                        // highest animating stack and no higher.

                        layerForAnimationLayer = layer++;

                    }

                    if (state != ALWAYS_ON_TOP_STATE) {

                        layerForBoostedAnimationLayer = layer++;

                    }

                }

            }

            if (mAppAnimationLayer != null) {

                t.setLayer(mAppAnimationLayer, layerForAnimationLayer);

            }

            if (mBoostedAppAnimationLayer != null) {

                t.setLayer(mBoostedAppAnimationLayer, layerForBoostedAnimationLayer);

            }

        }



        @Override

        SurfaceControl getAppAnimationLayer() {

            return mAppAnimationLayer;

        SurfaceControl getAppAnimationLayer(boolean boosted) {

            return boosted ? mBoostedAppAnimationLayer : mAppAnimationLayer;

        }



        SurfaceControl getSplitScreenDividerAnchor() {
@@ -3573,16 +3582,22 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                mAppAnimationLayer = makeChildSurface(null)

                        .setName("animationLayer")

                        .build();

                mBoostedAppAnimationLayer = makeChildSurface(null)

                        .setName("boostedAnimationLayer")

                        .build();

                mSplitScreenDividerAnchor = makeChildSurface(null)

                        .setName("splitScreenDividerAnchor")

                        .build();

                getPendingTransaction()

                        .show(mAppAnimationLayer)

                        .show(mBoostedAppAnimationLayer)

                        .show(mSplitScreenDividerAnchor);

                scheduleAnimation();

            } else {

                mAppAnimationLayer.destroy();

                mAppAnimationLayer = null;

                mBoostedAppAnimationLayer.destroy();

                mBoostedAppAnimationLayer = null;

                mSplitScreenDividerAnchor.destroy();

                mSplitScreenDividerAnchor = null;

            }
@@ -3864,7 +3879,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        super.prepareSurfaces();

    }



    void assignStackOrdering(SurfaceControl.Transaction t) {

        mTaskStackContainers.assignStackOrdering(t);

    void assignStackOrdering() {

        mTaskStackContainers.assignStackOrdering(getPendingTransaction());

    }

}

services/core/java/com/android/server/wm/WindowContainer.java

+5 −2
Original line number Diff line number Diff line
@@ -1125,12 +1125,15 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
    }



    /**

     * @param boosted If true, returns an animation layer that happens above all {@link TaskStack}s

     *                Otherwise, the layer will be positioned above all animating

     *                {@link TaskStack}s.

     * @return The layer on which all app animations are happening.

     */

    SurfaceControl getAppAnimationLayer() {

    SurfaceControl getAppAnimationLayer(boolean boosted) {

        final WindowContainer parent = getParent();

        if (parent != null) {

            return parent.getAppAnimationLayer();

            return parent.getAppAnimationLayer(boosted);

        }

        return null;

    }