openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix testStressSwipeToOverview" into sc-dev am: aabead2db8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16471550

Change-Id: Id7353bbafe62f70b0b1659455e731bc3ecf85de2
This commit is contained in:
TreeHugger Robot 2021-12-22 20:23:47 +00:00 committed by Automerger Merge Worker
parent 925768d35a aabead2db8
commit 5181163070
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@ -428,6 +428,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
mAnimationFactory = mActivityInterface.prepareRecentsUI(mDeviceState, mAnimationFactory = mActivityInterface.prepareRecentsUI(mDeviceState,
mWasLauncherAlreadyVisible, this::onAnimatorPlaybackControllerCreated); mWasLauncherAlreadyVisible, this::onAnimatorPlaybackControllerCreated);
maybeUpdateRecentsAttachedState(false /* animate */); maybeUpdateRecentsAttachedState(false /* animate */);
if (mGestureState.getEndTarget() != null) {
// Update the end target in case the gesture ended before we init.
mAnimationFactory.setEndTarget(mGestureState.getEndTarget());
}
}; };
if (mWasLauncherAlreadyVisible) { if (mWasLauncherAlreadyVisible) {
// Launcher is visible, but might be about to stop. Thus, if we prepare recents // Launcher is visible, but might be about to stop. Thus, if we prepare recents

2
quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
View File

@ -44,7 +44,7 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
protected void onLauncherActivityClose(Launcher launcher) { protected void onLauncherActivityClose(Launcher launcher) {
RecentsView recentsView = launcher.getOverviewPanel(); RecentsView recentsView = launcher.getOverviewPanel();
if (recentsView != null) { if (recentsView != null) {
recentsView.finishRecentsAnimation(true, null); recentsView.finishRecentsAnimation(false /* toRecents */, null);
} }
} }