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

Commit 720fced0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I3610bfef,I7b898f21,I32ab03b1 

* changes:
  Superficial improvements to ZOrderingTest.
  Ensure docked divider is below always-on-top stacks.
  Restore old stack Z ordering promotion.
parents 9c3d64e6 515a40a1

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

+46 −23
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; 
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;

import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS;

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static android.view.WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_DREAM;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
@@ -3496,37 +3497,47 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


        @Override

        void assignChildLayers(SurfaceControl.Transaction t) {

            int layer = 0;



            // We allow stacks to change visual order from the AM specified order due to

            // Z-boosting during animations. However we must take care to ensure TaskStacks

            // which are marked as alwaysOnTop remain that way.

            final int NORMAL_STACK_STATE = 0;

            final int SPLIT_SCREEN_STACK_STATE = 1;

            final int ASSISTANT_STACK_STATE = 2;

            final int BOOSTED_STATE = 3;

            final int ALWAYS_ON_TOP_STATE = 4;



            int layer = 0;

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

                for (int i = 0; i < mChildren.size(); i++) {

                    final TaskStack s = mChildren.get(i);

                s.assignChildLayers();

                if (!s.needsZBoost() && !s.isAlwaysOnTop()) {

                    s.assignLayer(t, layer++);

                    layer++;

                    if (state == NORMAL_STACK_STATE && !s.inSplitScreenPrimaryWindowingMode() &&

                            !s.isActivityTypeAssistant() &&

                            !s.needsZBoost() && !s.isAlwaysOnTop()) {

                        s.assignLayer(t, layer);

                    } else if (state == SPLIT_SCREEN_STACK_STATE &&

                            s.inSplitScreenPrimaryWindowingMode()) {

                        s.assignLayer(t, layer);

                    } else if (state == ASSISTANT_STACK_STATE &&

                            s.isActivityTypeAssistant()) {

                        s.assignLayer(t, layer);

                    } else if (state == BOOSTED_STATE && s.needsZBoost()) {

                        s.assignLayer(t, layer);

                    } else if (state == ALWAYS_ON_TOP_STATE &&

                            s.isAlwaysOnTop()) {

                        s.assignLayer(t, layer);

                    }

                }

            for (int i = 0; i < mChildren.size(); i++) {

                final TaskStack s = mChildren.get(i);

                if (s.needsZBoost() && !s.isAlwaysOnTop()) {

                    s.assignLayer(t, layer++);

                // The appropriate place for App-Transitions to occur is right

                // above all other animations but still below things in the Picture-and-Picture

                // windowing mode.

                if (state == BOOSTED_STATE && mAppAnimationLayer != null) {

                    t.setLayer(mAppAnimationLayer, layer++);

                }

            }

            for (int i = 0; i < mChildren.size(); i++) {

                final TaskStack s = mChildren.get(i);

                if (s.isAlwaysOnTop()) {

                    s.assignLayer(t, layer++);

                }

                s.assignChildLayers(t);

            }



            // The appropriate place for App-Transitions to occur is right

            // above all other animations but still below things in the Picture-and-Picture

            // windowing mode.

            if (mAppAnimationLayer != null) {

                t.setLayer(mAppAnimationLayer, layer++);

            }

        }



        @Override
@@ -3560,6 +3571,18 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                    && imeContainer.getSurfaceControl() != null;

            for (int j = 0; j < mChildren.size(); ++j) {

                final WindowToken wt = mChildren.get(j);



                // The divider is unique in that it does not have an AppWindowToken but needs to be

                // interleaved with them. In particular it must be above any split-screen stacks

                // but below any always-on-top stacks.

                if (wt.windowType == TYPE_DOCK_DIVIDER) {

                    final TaskStack dockedStack = getSplitScreenPrimaryStack();

                    if (dockedStack != null) {

                        wt.assignRelativeLayer(t, dockedStack.getSurfaceControl(),

                                Integer.MAX_VALUE);

                        continue;

                    }

                }

                wt.assignLayer(t, j);

                wt.assignChildLayers(t);

services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java

+97 −65
Original line number Diff line number Diff line
@@ -21,10 +21,12 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL;
@@ -74,11 +76,11 @@ public class ZOrderingTests extends WindowTestsBase { 
            return super.setRelativeLayer(sc, relativeTo, layer);

        }



        int getLayer(SurfaceControl sc) {

        private int getLayer(SurfaceControl sc) {

            return mLayersForControl.getOrDefault(sc, 0);

        }



        SurfaceControl getRelativeLayer(SurfaceControl sc) {

        private SurfaceControl getRelativeLayer(SurfaceControl sc) {

            return mRelativeLayersForControl.get(sc);

        }

    };
@@ -146,8 +148,9 @@ public class ZOrderingTests extends WindowTestsBase { 
        return p;

    }



    void assertZOrderGreaterThan(LayerRecordingTransaction t,

            SurfaceControl left, SurfaceControl right) throws Exception {



    void assertZOrderGreaterThan(LayerRecordingTransaction t, SurfaceControl left,

            SurfaceControl right) throws Exception {

        final LinkedList<SurfaceControl> leftParentChain = getAncestors(t, left);

        final LinkedList<SurfaceControl> rightParentChain = getAncestors(t, right);
@@ -171,9 +174,12 @@ public class ZOrderingTests extends WindowTestsBase { 
        }

    }



    void assertWindowLayerGreaterThan(LayerRecordingTransaction t,

            WindowState left, WindowState right) throws Exception {

        assertZOrderGreaterThan(t, left.getSurfaceControl(), right.getSurfaceControl());

    void assertWindowHigher(WindowState left, WindowState right) throws Exception {

        assertZOrderGreaterThan(mTransaction, left.getSurfaceControl(), right.getSurfaceControl());

    }



    WindowState createWindow(String name) {

        return createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, name);

    }



    @Test
@@ -184,38 +190,37 @@ public class ZOrderingTests extends WindowTestsBase { 
        // The Ime has an higher base layer than app windows and lower base layer than system

        // windows, so it should be above app windows and below system windows if there isn't an IME

        // target.

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mChildAppWindowAbove);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, mNavBarWindow, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mStatusBarWindow, mImeWindow);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mAppWindow);

        assertWindowHigher(mNavBarWindow, mImeWindow);

        assertWindowHigher(mStatusBarWindow, mImeWindow);



        // And, IME dialogs should always have an higher layer than the IME.

        assertWindowLayerGreaterThan(mTransaction, mImeDialogWindow, mImeWindow);

        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @Test

    public void testAssignWindowLayers_ForImeWithAppTarget() throws Exception {

        final WindowState imeAppTarget =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "imeAppTarget");

        final WindowState imeAppTarget = createWindow("imeAppTarget");

        sWm.mInputMethodTarget = imeAppTarget;



        mDisplayContent.assignChildLayers(mTransaction);



        // Ime should be above all app windows and below system windows if it is targeting an app

        // window.

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, imeAppTarget);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mChildAppWindowAbove);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, mNavBarWindow, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mStatusBarWindow, mImeWindow);

        assertWindowHigher(mImeWindow, imeAppTarget);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mAppWindow);

        assertWindowHigher(mNavBarWindow, mImeWindow);

        assertWindowHigher(mStatusBarWindow, mImeWindow);



        // And, IME dialogs should always have an higher layer than the IME.

        assertWindowLayerGreaterThan(mTransaction, mImeDialogWindow, mImeWindow);

        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @Test

    public void testAssignWindowLayers_ForImeWithAppTargetWithChildWindows() throws Exception {

        final WindowState imeAppTarget =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "imeAppTarget");

        final WindowState imeAppTarget = createWindow("imeAppTarget");

        final WindowState imeAppTargetChildAboveWindow = createWindow(imeAppTarget,

                TYPE_APPLICATION_ATTACHED_DIALOG, imeAppTarget.mToken,

                "imeAppTargetChildAboveWindow");
@@ -228,41 +233,38 @@ public class ZOrderingTests extends WindowTestsBase { 


        // Ime should be above all app windows except for child windows that are z-ordered above it

        // and below system windows if it is targeting an app window.

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, imeAppTarget);

        assertWindowLayerGreaterThan(mTransaction, imeAppTargetChildAboveWindow, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mChildAppWindowAbove);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, mNavBarWindow, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mStatusBarWindow, mImeWindow);

        assertWindowHigher(mImeWindow, imeAppTarget);

        assertWindowHigher(imeAppTargetChildAboveWindow, mImeWindow);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mAppWindow);

        assertWindowHigher(mNavBarWindow, mImeWindow);

        assertWindowHigher(mStatusBarWindow, mImeWindow);



        // And, IME dialogs should always have an higher layer than the IME.

        assertWindowLayerGreaterThan(mTransaction, mImeDialogWindow, mImeWindow);

        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @Test

    public void testAssignWindowLayers_ForImeWithAppTargetAndAppAbove() throws Exception {

        final WindowState appBelowImeTarget =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "appBelowImeTarget");

        final WindowState imeAppTarget =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "imeAppTarget");

        final WindowState appAboveImeTarget =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "appAboveImeTarget");

        final WindowState appBelowImeTarget = createWindow("appBelowImeTarget");

        final WindowState imeAppTarget = createWindow("imeAppTarget");

        final WindowState appAboveImeTarget = createWindow("appAboveImeTarget");



        sWm.mInputMethodTarget = imeAppTarget;

        mDisplayContent.assignChildLayers(mTransaction);



        // Ime should be above all app windows except for non-fullscreen app window above it and

        // below system windows if it is targeting an app window.

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, imeAppTarget);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, appBelowImeTarget);

        assertWindowLayerGreaterThan(mTransaction, appAboveImeTarget, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mChildAppWindowAbove);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, mNavBarWindow, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mStatusBarWindow, mImeWindow);

        assertWindowHigher(mImeWindow, imeAppTarget);

        assertWindowHigher(mImeWindow, appBelowImeTarget);

        assertWindowHigher(appAboveImeTarget, mImeWindow);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mAppWindow);

        assertWindowHigher(mNavBarWindow, mImeWindow);

        assertWindowHigher(mStatusBarWindow, mImeWindow);



        // And, IME dialogs should always have an higher layer than the IME.

        assertWindowLayerGreaterThan(mTransaction, mImeDialogWindow, mImeWindow);

        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @Test
@@ -276,20 +278,20 @@ public class ZOrderingTests extends WindowTestsBase { 


        // The IME target base layer is higher than all window except for the nav bar window, so the

        // IME should be above all windows except for the nav bar.

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, imeSystemOverlayTarget);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mChildAppWindowAbove);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mDockedDividerWindow);

        assertWindowHigher(mImeWindow, imeSystemOverlayTarget);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mAppWindow);

        assertWindowHigher(mImeWindow, mDockedDividerWindow);



        // The IME has a higher base layer than the status bar so we may expect it to go

        // above the status bar once they are both in the Non-App layer, as past versions of this

        // test enforced. However this seems like the wrong behavior unless the status bar is the

        // IME target.

        assertWindowLayerGreaterThan(mTransaction, mNavBarWindow, mImeWindow);

        assertWindowLayerGreaterThan(mTransaction, mStatusBarWindow, mImeWindow);

        assertWindowHigher(mNavBarWindow, mImeWindow);

        assertWindowHigher(mStatusBarWindow, mImeWindow);



        // And, IME dialogs should always have an higher layer than the IME.

        assertWindowLayerGreaterThan(mTransaction, mImeDialogWindow, mImeWindow);

        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @Test
@@ -297,17 +299,18 @@ public class ZOrderingTests extends WindowTestsBase { 
        sWm.mInputMethodTarget = mStatusBarWindow;

        mDisplayContent.assignChildLayers(mTransaction);



        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mChildAppWindowAbove);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mDockedDividerWindow);

        assertWindowLayerGreaterThan(mTransaction, mImeWindow, mStatusBarWindow);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mAppWindow);

        assertWindowHigher(mImeWindow, mDockedDividerWindow);

        assertWindowHigher(mImeWindow, mStatusBarWindow);



        // And, IME dialogs should always have an higher layer than the IME.

        assertWindowLayerGreaterThan(mTransaction, mImeDialogWindow, mImeWindow);

        assertWindowHigher(mImeDialogWindow, mImeWindow);

    }



    @Test

    public void testStackLayers() throws Exception {

        final WindowState anyWindow1 = createWindow("anyWindow");

        final WindowState pinnedStackWindow = createWindowOnStack(null, WINDOWING_MODE_PINNED,

                ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION, mDisplayContent,

                "pinnedStackWindow");
@@ -317,12 +320,17 @@ public class ZOrderingTests extends WindowTestsBase { 
        final WindowState assistantStackWindow = createWindowOnStack(null, WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_ASSISTANT, TYPE_BASE_APPLICATION,

                mDisplayContent, "assistantStackWindow");

        final WindowState anyWindow2 = createWindow("anyWindow2");



        mDisplayContent.assignChildLayers(mTransaction);



        assertWindowLayerGreaterThan(mTransaction, dockedStackWindow, mAppWindow);

        assertWindowLayerGreaterThan(mTransaction, assistantStackWindow, dockedStackWindow);

        assertWindowLayerGreaterThan(mTransaction, pinnedStackWindow, assistantStackWindow);

        // We compare the split-screen windowing mode to two different normal windowing

        // mode windows added before and after it to ensure the correct Z ordering irrespective

        // of ordering in the child list.

        assertWindowHigher(dockedStackWindow, anyWindow1);

        assertWindowHigher(dockedStackWindow, anyWindow2);

        assertWindowHigher(assistantStackWindow, dockedStackWindow);

        assertWindowHigher(pinnedStackWindow, assistantStackWindow);

    }



    @Test
@@ -337,9 +345,9 @@ public class ZOrderingTests extends WindowTestsBase { 


        // Ime should be above all app windows and below system windows if it is targeting an app

        // window.

        assertWindowLayerGreaterThan(mTransaction, navBarPanel, mNavBarWindow);

        assertWindowLayerGreaterThan(mTransaction, statusBarPanel, mStatusBarWindow);

        assertWindowLayerGreaterThan(mTransaction, statusBarSubPanel, statusBarPanel);

        assertWindowHigher(navBarPanel, mNavBarWindow);

        assertWindowHigher(statusBarPanel, mStatusBarWindow);

        assertWindowHigher(statusBarSubPanel, statusBarPanel);

    }



    @Test
@@ -347,8 +355,7 @@ public class ZOrderingTests extends WindowTestsBase { 
        // TODO(b/70040778): We should aim to eliminate the last user of TYPE_APPLICATION_MEDIA

        // then we can drop all negative layering on the windowing side.



        final WindowState anyWindow =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "anyWindow");

        final WindowState anyWindow = createWindow("anyWindow");

        final WindowState child = createWindow(anyWindow, TYPE_APPLICATION_MEDIA, mDisplayContent,

                "TypeApplicationMediaChild");

        final WindowState mediaOverlayChild = createWindow(anyWindow, TYPE_APPLICATION_MEDIA_OVERLAY,
@@ -356,7 +363,32 @@ public class ZOrderingTests extends WindowTestsBase { 


        mDisplayContent.assignChildLayers(mTransaction);



        assertWindowLayerGreaterThan(mTransaction, anyWindow, mediaOverlayChild);

        assertWindowLayerGreaterThan(mTransaction, mediaOverlayChild, child);

        assertWindowHigher(anyWindow, mediaOverlayChild);

        assertWindowHigher(mediaOverlayChild, child);

    }



    @Test

    public void testDockedDividerPosition() throws Exception {

        final WindowState pinnedStackWindow = createWindowOnStack(null, WINDOWING_MODE_PINNED,

                ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION, mDisplayContent,

                "pinnedStackWindow");

        final WindowState splitScreenWindow = createWindowOnStack(null,

                WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION,

                mDisplayContent, "splitScreenWindow");

        final WindowState splitScreenSecondaryWindow = createWindowOnStack(null,

                WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_STANDARD,

                TYPE_BASE_APPLICATION, mDisplayContent, "splitScreenSecondaryWindow");

        final WindowState assistantStackWindow = createWindowOnStack(null, WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_ASSISTANT, TYPE_BASE_APPLICATION,

                mDisplayContent, "assistantStackWindow");

        final WindowState dockedDividerWindow = createWindow(null, TYPE_DOCK_DIVIDER,

                mDisplayContent, "dockedDivider");



        mDisplayContent.assignChildLayers(mTransaction);



        assertWindowHigher(dockedDividerWindow, splitScreenWindow);

        assertWindowHigher(dockedDividerWindow, splitScreenSecondaryWindow);

        assertWindowHigher(assistantStackWindow, dockedDividerWindow);

        assertWindowHigher(pinnedStackWindow, dockedDividerWindow);

    }

}