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

Commit 19e452ea authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Added non-app window tokens to window container hierarchy 

WindowContainer only allows its sub-classes to have homogenerous
children, however DisplayContent needs to have app window containers
that are managed by TaskStack and non-app window containers that are
managed by WindowToken. To do this we create a pass through class
DisplayChildWindowContainer that any container that wants to be a child
of DisplayContent needs to inherit from. Then, we can have DisplayContent
contain DisplayChildWindowContainer types and have sub-class children
like TaskStackContainers and NonAppWindowContainers

Bug: 30060889
Test: Existing tests pass.
Change-Id: I3848958eddcd51030cfe20bb1337476d203bbed3
parent ccbc5c18

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

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
     * surfaces that's eligible, if the app is already stopped.

     */

    private void destroySurfaces(boolean cleanupOnResume) {

        final DisplayContentList displayList = new DisplayContentList();

        final ArrayList<DisplayContent> displayList = new ArrayList();

        for (int i = mChildren.size() - 1; i >= 0; i--) {

            final WindowState win = mChildren.get(i);

            final boolean destroyed = win.destroySurface(cleanupOnResume, mAppStopped);

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

+185 −97

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { 
            }

            mService.mPendingRemove.toArray(mService.mPendingRemoveTmp);

            mService.mPendingRemove.clear();

            DisplayContentList displayList = new DisplayContentList();

            ArrayList<DisplayContent> displayList = new ArrayList();

            for (i = 0; i < N; i++) {

                final WindowState w = mService.mPendingRemoveTmp[i];

                w.removeImmediately();

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

+3 −5

File changed.

Preview size limit exceeded, changes collapsed.