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

Merge "Make sure recents animation input consumer is above the top task" into sc-v2-dev am: 97c59ee57d

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

Change-Id: I2777fd0da0a1f7855ab924d276f173a688227fe3
This commit is contained in:
Winson Chung
2021-08-05 20:47:40 +00:00
committed by Automerger Merge Worker
parent d7927ec2f0 97c59ee57d
commit 099ac81ce4
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -539,7 +539,8 @@ final class InputMonitor {
if (mAddRecentsAnimationInputConsumerHandle && shouldApplyRecentsInputConsumer) {
if (recentsAnimationController.updateInputConsumerForApp(
mRecentsAnimationInputConsumer.mWindowHandle)) {
mRecentsAnimationInputConsumer.show(mInputTransaction, w.mActivityRecord);
mRecentsAnimationInputConsumer.show(mInputTransaction,
recentsAnimationController.getHighestLayerTask());
mAddRecentsAnimationInputConsumerHandle = false;
}
}

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

@@ -1102,6 +1102,23 @@ public class RecentsAnimationController implements DeathRecipient {
return mTargetActivityRecord.findMainWindow();
}
/**
* Returns the task with the highest layer, or null if none is found.
*/
public Task getHighestLayerTask() {
int highestLayer = Integer.MIN_VALUE;
Task highestLayerTask = null;
for (int i = mPendingAnimations.size() - 1; i >= 0; i--) {
TaskAnimationAdapter adapter = mPendingAnimations.get(i);
int layer = adapter.mTask.getPrefixOrderIndex();
if (layer > highestLayer) {
highestLayer = layer;
highestLayerTask = adapter.mTask;
}
}
return highestLayerTask;
}
boolean isAnimatingTask(Task task) {
for (int i = mPendingAnimations.size() - 1; i >= 0; i--) {
if (task == mPendingAnimations.get(i).mTask) {