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

Merge "Don't reorder tasks if the recents animation is not running to home" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2021-07-01 23:13:29 +00:00
committed by Android (Google) Code Review
parent e1f4e0f0eb 9f4e80879e
commit 470baa3157
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -823,8 +824,10 @@ public class RecentsAnimationController implements DeathRecipient {
if (mCanceled) { if (mCanceled) {
return; return;
} }
cancelAnimation(mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_KEEP_IN_PLACE, final int reorderMode = mTargetActivityType == ACTIVITY_TYPE_HOME && mWillFinishToHome
true /* screenshot */, "cancelAnimationForHomeStart"); ? REORDER_MOVE_TO_TOP
: REORDER_KEEP_IN_PLACE;
cancelAnimation(reorderMode, true /* screenshot */, "cancelAnimationForHomeStart");
} }
/** /**

4
services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java
View File

@@ -683,12 +683,12 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
@Test @Test
public void testCancelForStartHome() throws Exception { public void testCancelForStartHome() throws Exception {
mWm.setRecentsAnimationController(mController); mWm.setRecentsAnimationController(mController);
final ActivityRecord homeActivity = createHomeActivity();
final ActivityRecord activity = createActivityRecord(mDefaultDisplay); final ActivityRecord activity = createActivityRecord(mDefaultDisplay);
final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
activity.addWindow(win1); activity.addWindow(win1);
RecentsAnimationController.TaskAnimationAdapter adapter = mController.addAnimation( initializeRecentsAnimationController(mController, homeActivity);
activity.getTask(), false /* isRecentTaskInvisible */);
mController.setWillFinishToHome(true); mController.setWillFinishToHome(true);
// Verify cancel is called with a snapshot and that we've created an overlay // Verify cancel is called with a snapshot and that we've created an overlay