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

Don't reorder tasks if the recents animation is not running to home

Browse Source 
- This fixes a regression from ag/15090191, in the case where there is
  a 3p launcher, then we don't want to ever move home to top

Bug: 140749967
Bug: 185643608
Test: FallbackRecentsTests#testOverview
Test: atest RecentsAnimationControllerTest
Change-Id: Iaab4a3431be9c33908c5c8b3354e793ec321389a
This commit is contained in:
Winson Chung
2021-06-28 16:18:54 -07:00
parent aa1b081a72
commit 9f4e80879e
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;
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_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -823,8 +824,10 @@ public class RecentsAnimationController implements DeathRecipient {
if (mCanceled) {
return;
}
cancelAnimation(mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_KEEP_IN_PLACE,
true /* screenshot */, "cancelAnimationForHomeStart");
final int reorderMode = mTargetActivityType == ACTIVITY_TYPE_HOME && mWillFinishToHome
? 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
public void testCancelForStartHome() throws Exception {
mWm.setRecentsAnimationController(mController);
final ActivityRecord homeActivity = createHomeActivity();
final ActivityRecord activity = createActivityRecord(mDefaultDisplay);
final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
activity.addWindow(win1);
RecentsAnimationController.TaskAnimationAdapter adapter = mController.addAnimation(
activity.getTask(), false /* isRecentTaskInvisible */);
initializeRecentsAnimationController(mController, homeActivity);
mController.setWillFinishToHome(true);
// Verify cancel is called with a snapshot and that we've created an overlay