Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix animation when launching AppInfo in LiveTile task"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-16 11:37:32 +00:00
committed by Android (Google) Code Review
parent 02b797b3f9 ae078778c8
commit cce9df2afc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -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 =

6
services/core/java/com/android/server/wm/RecentsAnimationController.java
View File

@@ -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();
}
/**