Merge RootActivityContainer and RootWindowContainer (85/n)
Bug: 80414790
Test: Existing tests pass
Change-Id: Ica2917099b09e6c091100401645ffcdfff761aa5
diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java
index 0a8e747..647be0f 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimation.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimation.java
@@ -84,7 +84,7 @@
@Nullable WindowProcessController caller) {
mService = atm;
mStackSupervisor = stackSupervisor;
- mDefaultDisplay = mService.mRootActivityContainer.getDefaultDisplay();
+ mDefaultDisplay = mService.mRootWindowContainer.getDefaultDisplay();
mActivityStartController = activityStartController;
mWindowManager = wm;
mTargetIntent = targetIntent;
@@ -165,7 +165,7 @@
// TODO(multi-display) currently only support recents animation in default display.
final DisplayContent dc =
- mService.mRootActivityContainer.getDefaultDisplay().mDisplayContent;
+ mService.mRootWindowContainer.getDefaultDisplay().mDisplayContent;
if (!mWindowManager.canStartRecentsAnimation()) {
notifyAnimationCancelBeforeStart(recentsAnimationRunner);
ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
@@ -193,7 +193,7 @@
// Send launch hint if we are actually launching the target. If it's already visible
// (shouldn't happen in general) we don't need to send it.
if (targetActivity == null || !targetActivity.mVisibleRequested) {
- mService.mRootActivityContainer.sendPowerHintForLaunchStartIfNeeded(
+ mService.mRootWindowContainer.sendPowerHintForLaunchStartIfNeeded(
true /* forceSend */, targetActivity);
}
@@ -255,7 +255,7 @@
// If we updated the launch-behind state, update the visibility of the activities after
// we fetch the visible tasks to be controlled by the animation
- mService.mRootActivityContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS);
+ mService.mRootWindowContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS);
mStackSupervisor.getActivityMetricsLogger().notifyActivityLaunched(launchingState,
START_TASK_TO_FRONT, targetActivity);
@@ -288,7 +288,7 @@
// Just to be sure end the launch hint in case the target activity was never launched.
// However, if we're keeping the activity and making it visible, we can leave it on.
if (reorderMode != REORDER_KEEP_IN_PLACE) {
- mService.mRootActivityContainer.sendPowerHintForLaunchEndIfNeeded();
+ mService.mRootWindowContainer.sendPowerHintForLaunchEndIfNeeded();
}
// Once the target is shown, prevent spurious background app switches
@@ -381,8 +381,8 @@
}
mWindowManager.prepareAppTransition(TRANSIT_NONE, false);
- mService.mRootActivityContainer.ensureActivitiesVisible(null, 0, false);
- mService.mRootActivityContainer.resumeFocusedStacksTopActivities();
+ mService.mRootWindowContainer.ensureActivitiesVisible(null, 0, false);
+ mService.mRootWindowContainer.resumeFocusedStacksTopActivities();
// No reason to wait for the pausing activity in this case, as the hiding of
// surfaces needs to be done immediately.
@@ -424,7 +424,7 @@
}
final DisplayContent dc =
- mService.mRootActivityContainer.getDefaultDisplay().mDisplayContent;
+ mService.mRootWindowContainer.getDefaultDisplay().mDisplayContent;
dc.mBoundsAnimationController.setAnimationType(
controller.shouldDeferCancelUntilNextTransition() ? FADE_IN : BOUNDS);