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

Commit 42c04433 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Android (Google) Code Review
Browse files

Merge "Fix transition for non-wallpaper activity."

parents 5293635e 6453ef48

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

+9 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm;



import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;

import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE;

import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;

import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;
@@ -636,10 +637,15 @@ class WindowSurfacePlacer { 
            return transit;

        }



        // if wallpaper is animating in or out set oldWallpaper to null else to wallpaper

        final WindowState wallpaperTarget = mWallpaperControllerLocked.getWallpaperTarget();

        final WindowState oldWallpaper = mWallpaperControllerLocked.isWallpaperTargetAnimating()

                ? null : wallpaperTarget;

        final boolean showWallpaper = wallpaperTarget != null

                && (wallpaperTarget.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0;

        // If wallpaper is animating or wallpaperTarget doesn't have SHOW_WALLPAPER flag set,

        // don't consider upgrading to wallpaper transition.

        final WindowState oldWallpaper =

                (mWallpaperControllerLocked.isWallpaperTargetAnimating() || !showWallpaper)

                        ? null

                        : wallpaperTarget;

        final ArraySet<AppWindowToken> openingApps = mService.mOpeningApps;

        final ArraySet<AppWindowToken> closingApps = mService.mClosingApps;

        final AppWindowToken topOpeningApp = getTopApp(mService.mOpeningApps,