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

Commit 5b64aa68 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Restore wallpaper positioning between apps." into klp-dev

parents 10ea1978 faf1a403

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

+2 −9
Original line number Diff line number Diff line
@@ -1855,10 +1855,10 @@ 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 " + 0);

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

                }



                windows.add(0, wallpaper);

                windows.add(foundI, wallpaper);

                mWindowsChanged = true;

                changed |= ADJUST_WALLPAPER_LAYERS_CHANGED;

            }
@@ -4671,13 +4671,6 @@ 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;

    }