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

Commit cce9df2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix animation when launching AppInfo in LiveTile task"

parents 02b797b3 ae078778

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

+5 −1
Original line number Diff line number Diff line
@@ -713,7 +713,11 @@ public class AppTransitionController { 


        final WindowState wallpaperTarget = mWallpaperControllerLocked.getWallpaperTarget();

        final boolean showWallpaper = wallpaperTarget != null

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

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

                // Update task open transition to wallpaper transition when wallpaper is visible.

                // (i.e.launching app info activity from recent tasks)

                || ((transit == TRANSIT_TASK_OPEN || transit == TRANSIT_TASK_TO_FRONT)

                && mWallpaperControllerLocked.isWallpaperVisible()));

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

        // don't consider upgrading to wallpaper transition.

        final WindowState oldWallpaper =

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

+4 −2
Original line number Diff line number Diff line
@@ -742,8 +742,10 @@ public class RecentsAnimationController implements DeathRecipient { 
    }



    boolean isWallpaperVisible(WindowState w) {

        return w != null && w.mAttrs.type == TYPE_BASE_APPLICATION && w.mActivityRecord != null

                && mTargetActivityRecord == w.mActivityRecord && isTargetOverWallpaper();

        return w != null && w.mAttrs.type == TYPE_BASE_APPLICATION &&

                ((w.mActivityRecord != null && mTargetActivityRecord == w.mActivityRecord)

                        || isAnimatingTask(w.getTask()))

                && isTargetOverWallpaper();

    }



    /**