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

Commit faf1a403 authored by Craig Mautner's avatar Craig Mautner
Browse files

Restore wallpaper positioning between apps. 

Simplification where wallpaper was behind all apps didn't work when
keyguard and associated wallpaper needed to be above phone screen when
phone screen animated in and out. Instead phone screen was instantly
hiding the wallpaper.

Fixes most of bug 10932680.

This fixes the wallpaper disappearing as soon as the animation begins
when going from keyguard to phone. There remains jank going from phone
to lockscreen where the animation is not occurring and the phone
blanks out immediately.

Change-Id: Ie5f464acb2f6cefd2fb91f3b920a687ec7c15d76
parent 5a783173

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;

    }