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

Commit 15eebd10 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Do not transfer starting window to translucent activity

am: a28e8cc5

* commit 'a28e8cc5':
  Do not transfer starting window to translucent activity

Change-Id: I6e3914a37e8ea42eade6f03629d2fca51d7ff4d7
parents 3c312c78 a28e8cc5
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -3940,16 +3940,6 @@ public class WindowManagerService extends IWindowManager.Stub
                return;
            }

            if (transferStartingWindow(transferFrom, wtoken)) {
                return;
            }

            // There is no existing starting window, and the caller doesn't
            // want us to create one, so that's it!
            if (!createIfNeeded) {
                return;
            }

            // If this is a translucent window, then don't
            // show a starting window -- the current effect (a full-screen
            // opaque starting window that fades away to the real contents
@@ -3995,6 +3985,16 @@ public class WindowManagerService extends IWindowManager.Stub
                }
            }

            if (transferStartingWindow(transferFrom, wtoken)) {
                return;
            }

            // There is no existing starting window, and the caller doesn't
            // want us to create one, so that's it!
            if (!createIfNeeded) {
                return;
            }

            if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Creating StartingData");
            wtoken.startingData = new StartingData(pkg, theme, compatInfo, nonLocalizedLabel,
                    labelRes, icon, logo, windowFlags);