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

Merge "Consolidate the starting window leash relative position." into tm-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2022-03-24 02:08:04 +00:00
committed by Android (Google) Code Review
parent 66fa90eae0 9cc236b8ff
commit ad7242029d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -31,6 +31,7 @@ import android.app.ActivityManager.RunningTaskInfo;
import android.app.WindowConfiguration;
import android.content.Intent;
import android.content.pm.ParceledListSlice;
import android.graphics.Rect;
import android.os.Binder;
import android.os.IBinder;
import android.os.Parcel;
@@ -474,10 +475,12 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
}
}
static SurfaceControl applyStartingWindowAnimation(WindowContainer window) {
static SurfaceControl applyStartingWindowAnimation(WindowState window) {
final SurfaceControl.Transaction t = window.getPendingTransaction();
final Rect mainFrame = window.getRelativeFrame();
final StartingWindowAnimationAdaptor adaptor = new StartingWindowAnimationAdaptor();
window.startAnimation(window.getPendingTransaction(), adaptor, false,
ANIMATION_TYPE_STARTING_REVEAL);
window.startAnimation(t, adaptor, false, ANIMATION_TYPE_STARTING_REVEAL);
t.setPosition(adaptor.mAnimationLeash, mainFrame.left, mainFrame.top);
return adaptor.mAnimationLeash;
}
@@ -530,8 +533,6 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
final SurfaceControl.Transaction t = mainWindow.getPendingTransaction();
removalInfo.windowAnimationLeash = applyStartingWindowAnimation(mainWindow);
removalInfo.mainFrame = mainWindow.getRelativeFrame();
t.setPosition(removalInfo.windowAnimationLeash,
removalInfo.mainFrame.left, removalInfo.mainFrame.top);
}
}
}