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

Merge "Skip marking recents as pending top if it is already on top" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-07-12 21:40:36 +00:00
committed by Android (Google) Code Review
parent 224f71520f 88f306e2ba
commit 0c94b5293d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -952,7 +952,8 @@ public class RecentsAnimationController implements DeathRecipient {
"cleanupAnimation(): Notify animation finished mPendingAnimations=%d " "cleanupAnimation(): Notify animation finished mPendingAnimations=%d "
+ "reorderMode=%d", + "reorderMode=%d",
mPendingAnimations.size(), reorderMode); mPendingAnimations.size(), reorderMode);
if (reorderMode != REORDER_MOVE_TO_ORIGINAL_POSITION) { if (reorderMode != REORDER_MOVE_TO_ORIGINAL_POSITION
&& mTargetActivityRecord != mDisplayContent.topRunningActivity()) {
// Notify the state at the beginning because the removeAnimation may notify the // Notify the state at the beginning because the removeAnimation may notify the
// transition is finished. This is a signal that there will be a next transition. // transition is finished. This is a signal that there will be a next transition.
mDisplayContent.mFixedRotationTransitionListener.notifyRecentsWillBeTop(); mDisplayContent.mFixedRotationTransitionListener.notifyRecentsWillBeTop();

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

@@ -701,6 +701,12 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
// Continue the animation (simulating a call to cleanupScreenshot()) // Continue the animation (simulating a call to cleanupScreenshot())
mController.continueDeferredCancelAnimation(); mController.continueDeferredCancelAnimation();
verify(mAnimationCallbacks).onAnimationFinished(REORDER_MOVE_TO_TOP, false); verify(mAnimationCallbacks).onAnimationFinished(REORDER_MOVE_TO_TOP, false);
// Assume home was moved to front so will-be-top callback should not be called.
homeActivity.moveFocusableActivityToTop("test");
spyOn(mDefaultDisplay.mFixedRotationTransitionListener);
mController.cleanupAnimation(REORDER_MOVE_TO_TOP);
verify(mDefaultDisplay.mFixedRotationTransitionListener, never()).notifyRecentsWillBeTop();
} }
private ActivityRecord createHomeActivity() { private ActivityRecord createHomeActivity() {