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

Merge "Fix recents thumbnail wrong while swipe up" into tm-dev am: 0b87da7195 am: 8a0bd59c00

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17767846

Change-Id: Ie17ed9ceb2be948c791ea1933cadc587f039daa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2022-04-18 04:29:18 +00:00
committed by Automerger Merge Worker
parent fecba52e3d 8a0bd59c00
commit 66f843265a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -418,7 +418,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
} }
RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel, RemoteAnimationTarget[] apps) { RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel, RemoteAnimationTarget[] apps) {
if (ENABLE_SHELL_TRANSITIONS || apps.length < 2) return null; if (ENABLE_SHELL_TRANSITIONS || !isSplitScreenVisible()) return null;
// TODO(b/206487881): Integrate this with shell transition. // TODO(b/206487881): Integrate this with shell transition.
SurfaceControl.Transaction transaction = new SurfaceControl.Transaction(); SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();
if (mSplitTasksContainerLayer != null) { if (mSplitTasksContainerLayer != null) {

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

@@ -445,7 +445,7 @@ public class RecentsAnimationController implements DeathRecipient {
} }
final int taskCount = visibleTasks.size(); final int taskCount = visibleTasks.size();
for (int i = 0; i < taskCount; i++) { for (int i = taskCount - 1; i >= 0; i--) {
final Task task = visibleTasks.get(i); final Task task = visibleTasks.get(i);
if (skipAnimation(task)) { if (skipAnimation(task)) {
continue; continue;
@@ -746,7 +746,7 @@ public class RecentsAnimationController implements DeathRecipient {
ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
"collectTaskRemoteAnimations, target: %s", target); "collectTaskRemoteAnimations, target: %s", target);
} }
}, true); }, false /* traverseTopToBottom */);
} }
void logRecentsAnimationStartTime(int durationMs) { void logRecentsAnimationStartTime(int durationMs) {