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

Commit 5457e61f authored by Craig Mautner's avatar Craig Mautner
Browse files

Fix window and wallpaper position problems 

- Put wallpaper behind all other windows.

- When moving a task to the top or bottom of a stack, move all of the
other tasks' windows on the stack to the top or bottom with the task.

Change-Id: I0821341dfd602c9240c685e954dac42678132d4a
parent 77a0c9d7

services/java/com/android/server/wm/WindowManagerService.java

+39 −24
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.content.res.CompatibilityInfo; 
import android.content.res.Configuration;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Matrix;

import android.graphics.PixelFormat;

import android.graphics.Point;
@@ -1861,15 +1860,16 @@ public class WindowManagerService extends IWindowManager.Stub 
                // Now stick it in.

                if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) {

                    Slog.v(TAG, "Moving wallpaper " + wallpaper

                            + " from " + oldIndex + " to " + foundI);

                            + " from " + oldIndex + " to " + 0);

                }



                windows.add(foundI, wallpaper);

                windows.add(0, wallpaper);

                mWindowsChanged = true;

                changed |= ADJUST_WALLPAPER_LAYERS_CHANGED;

            }

        }



        /*

        final TaskStack targetStack =

                mWallpaperTarget == null ? null : mWallpaperTarget.getStack();

        if ((changed & ADJUST_WALLPAPER_LAYERS_CHANGED) != 0 &&
@@ -1888,6 +1888,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

            }

        }

        */



        if (targetChanged && DEBUG_WALLPAPER_LIGHT) {

            Slog.d(TAG, "New wallpaper: target=" + mWallpaperTarget
@@ -4628,7 +4629,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

            }

        }



        // Never put an app window underneath wallpaper.

        for (int pos = NW - 1; pos >= 0; pos--) {

            if (windows.get(pos).mIsWallpaper) {

                if (DEBUG_REORDER) Slog.v(TAG, "Found wallpaper @" + pos);

                return pos + 1;

            }

        }

        return 0;

    }
@@ -4692,19 +4699,26 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    private void moveTaskWindowsLocked(Task task) {

        DisplayContent displayContent = task.getDisplayContent();

    private void moveStackWindowsLocked(TaskStack stack) {

        DisplayContent displayContent = stack.getDisplayContent();



        // First remove all of the windows from the list.

        AppTokenList tokens = task.mAppTokens;

        final ArrayList<Task> tasks = stack.getTasks();

        final int numTasks = tasks.size();

        for (int taskNdx = 0; taskNdx < numTasks; ++taskNdx) {

            AppTokenList tokens = tasks.get(taskNdx).mAppTokens;

            final int numTokens = tokens.size();

            for (int tokenNdx = numTokens - 1; tokenNdx >= 0; --tokenNdx) {

                tmpRemoveAppWindowsLocked(tokens.get(tokenNdx));

            }

        }



        // And now add them back at the correct place.

        // Where to start adding?

        for (int taskNdx = 0; taskNdx < numTasks; ++taskNdx) {

            AppTokenList tokens = tasks.get(taskNdx).mAppTokens;

            int pos = findAppWindowInsertionPointLocked(tokens.get(0));

            final int numTokens = tokens.size();

            for (int tokenNdx = 0; tokenNdx < numTokens; ++tokenNdx) {

                final AppWindowToken wtoken = tokens.get(tokenNdx);

                if (wtoken != null) {
@@ -4715,13 +4729,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                    pos = newPos;

                }

            }

        }



        if (!updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,

                false /*updateInputWindows*/)) {

            assignLayersLocked(displayContent.getWindowList());

        }



        updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,

                false /*updateInputWindows*/);

        mInputMonitor.setUpdateInputWindowsNeededLw();

        performLayoutAndPlaceSurfacesLocked();

        mInputMonitor.updateInputWindowsLw(false /*force*/);
@@ -4753,7 +4767,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                stack.moveTaskToTop(task);

                displayContent.moveStack(stack, true);

                moveTaskWindowsLocked(task);

                moveStackWindowsLocked(stack);

            }

        } finally {

            Binder.restoreCallingIdentity(origId);
@@ -4770,9 +4784,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                            + " not found in mTaskIdToTask");

                    return;

                }

                task.mStack.moveTaskToBottom(task);

                moveTaskWindowsLocked(task);

                task.getDisplayContent().moveStack(task.mStack, false);

                final TaskStack stack = task.mStack;

                stack.moveTaskToBottom(task);

                task.getDisplayContent().moveStack(stack, false);

                moveStackWindowsLocked(stack);

            }

        } finally {

            Binder.restoreCallingIdentity(origId);