From b3072147247029c017e6b8ebae4610e794be4a26 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Wed, 20 Apr 2022 16:54:59 +0800 Subject: [PATCH] Fix animation target rule due to split screen arch change Because singleTop root arch change, it makes animation target as only one rather then both split root as target. It cause some expection callback wrong for client such as shell split side and Launcher side. We should change animation target rule to follow previous behavior before singleTop change. Fix: 228572519 Test: manual Test: pass existing tests Change-Id: Id68cb0ae22ed39ad42d0593bf152f5bd3bd5f9f1 --- .../server/wm/AppTransitionController.java | 9 ++++++ .../wm/AppTransitionControllerTest.java | 32 +++++++++++++++++++ .../android/server/wm/WindowTestsBase.java | 9 +++++- 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 3bda2e60334a4..701fc9441acb8 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -912,6 +912,15 @@ public class AppTransitionController { canPromote = false; } + // If the current window container is task and it have adjacent task, it means + // both tasks will open or close app toghther but we want get their opening or + // closing animation target independently so do not promote. + if (current.asTask() != null + && current.asTask().getAdjacentTaskFragment() != null + && current.asTask().getAdjacentTaskFragment().asTask() != null) { + canPromote = false; + } + // Find all siblings of the current WindowContainer in "candidates", move them into // a separate list "siblings", and checks if an animation target can be promoted // to its parent. diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java index 33b70249dabe5..81c6da4774f32 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -19,6 +19,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static android.view.WindowManager.TRANSIT_CHANGE; @@ -561,6 +562,37 @@ public class AppTransitionControllerTest extends WindowTestsBase { opening, closing, false /* visible */)); } + @Test + public void testGetAnimationTargets_splitScreenOpening() { + // [DisplayContent] - [Task] -+- [split task 1] -+- [Task1] - [AR1] (opening, invisible) + // +- [split task 2] -+- [Task2] - [AR2] (opening, invisible) + final Task singleTopRoot = createTask(mDisplayContent); + final TaskBuilder builder = new TaskBuilder(mSupervisor) + .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW) + .setParentTaskFragment(singleTopRoot) + .setCreatedByOrganizer(true); + final Task splitRoot1 = builder.build(); + final Task splitRoot2 = builder.build(); + splitRoot1.setAdjacentTaskFragment(splitRoot2, false /* moveTogether */); + final ActivityRecord activity1 = createActivityRecordWithParentTask(splitRoot1); + activity1.setVisible(false); + activity1.mVisibleRequested = true; + final ActivityRecord activity2 = createActivityRecordWithParentTask(splitRoot2); + activity2.setVisible(false); + activity2.mVisibleRequested = true; + + final ArraySet opening = new ArraySet<>(); + opening.add(activity1); + opening.add(activity2); + final ArraySet closing = new ArraySet<>(); + + // Promote animation targets up to Task level, not beyond. + assertEquals( + new ArraySet<>(new WindowContainer[]{splitRoot1, splitRoot2}), + AppTransitionController.getAnimationTargets( + opening, closing, true /* visible */)); + } + @Test public void testGetAnimationTargets_openingClosingTaskFragment() { // [DefaultTDA] - [Task] -+- [TaskFragment1] - [ActivityRecord1] (opening, invisible) diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index c672b9173570d..91caae98cce4f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -1294,6 +1294,7 @@ class WindowTestsBase extends SystemServiceTestsBase { private TaskFragment mParentTaskFragment; private boolean mCreateActivity = false; + private boolean mCreatedByOrganizer = false; TaskBuilder(ActivityTaskSupervisor supervisor) { mSupervisor = supervisor; @@ -1385,6 +1386,11 @@ class WindowTestsBase extends SystemServiceTestsBase { return this; } + TaskBuilder setCreatedByOrganizer(boolean createdByOrganizer) { + mCreatedByOrganizer = createdByOrganizer; + return this; + } + Task build() { SystemServicesTestRule.checkHoldsLock(mSupervisor.mService.mGlobalLock); @@ -1420,7 +1426,8 @@ class WindowTestsBase extends SystemServiceTestsBase { .setActivityInfo(mActivityInfo) .setIntent(mIntent) .setOnTop(mOnTop) - .setVoiceSession(mVoiceSession); + .setVoiceSession(mVoiceSession) + .setCreatedByOrganizer(mCreatedByOrganizer); final Task task; if (mParentTaskFragment == null) { task = builder.setActivityType(mActivityType)