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

Merge "Fix zordering of recents input consumer" into sc-v2-dev am: 895570a43b

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

Change-Id: I96c38d58842887219724c78c126b67e8dd133041
This commit is contained in:
Winson Chung
2021-08-13 23:13:46 +00:00
committed by Automerger Merge Worker
parent 1a373d4c3e 895570a43b
commit 0d3d2270df
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -543,7 +543,7 @@ final class InputMonitor {
if (recentsAnimationController.updateInputConsumerForApp(
mRecentsAnimationInputConsumer.mWindowHandle)) {
mRecentsAnimationInputConsumer.show(mInputTransaction,
recentsAnimationController.getHighestLayerTask());
recentsAnimationController.getHighestLayerActivity());
mAddRecentsAnimationInputConsumerHandle = false;
}
}

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

@@ -1103,9 +1103,9 @@ public class RecentsAnimationController implements DeathRecipient {
}
/**
* Returns the task with the highest layer, or null if none is found.
* Returns the activity with the highest layer, or null if none is found.
*/
public Task getHighestLayerTask() {
public ActivityRecord getHighestLayerActivity() {
int highestLayer = Integer.MIN_VALUE;
Task highestLayerTask = null;
for (int i = mPendingAnimations.size() - 1; i >= 0; i--) {
@@ -1116,7 +1116,7 @@ public class RecentsAnimationController implements DeathRecipient {
highestLayerTask = adapter.mTask;
}
}
return highestLayerTask;
return highestLayerTask.getTopMostActivity();
}
boolean isAnimatingTask(Task task) {