aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[automerger] Reset the UI to the proper state, if we start the swipe-ui gesture from an inconsistent state am: a04c779f86

Browse Source 
Change-Id: Ie8c72e058f35e4fce566b1751737de48b987ffe0
This commit is contained in:
Android Build Merger (Role)
2018-06-07 17:46:53 +00:00
parent 34838cf551 a04c779f86
commit 87c1a14ef1
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
View File

@@ -672,6 +672,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
if (mLauncher.hasSomeInvisibleFlag(PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION)) {
mLauncher.addForceInvisibleFlag(INVISIBLE_BY_PENDING_FLAGS);
mLauncher.getStateManager().moveToRestState();
}
AnimatorSet anim = null;

10
quickstep/src/com/android/quickstep/ActivityControlHelper.java
View File

@@ -16,6 +16,7 @@
package com.android.quickstep;
import static android.view.View.TRANSLATION_Y;
import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
import static com.android.launcher3.LauncherState.FAST_OVERVIEW;
@@ -52,6 +53,7 @@ import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
import com.android.launcher3.allapps.AllAppsTransitionController;
import com.android.launcher3.allapps.DiscoveryBounce;
import com.android.launcher3.anim.AnimationSuccessListener;
import com.android.launcher3.anim.AnimatorPlaybackController;
import com.android.launcher3.dragndrop.DragLayer;
import com.android.launcher3.uioverrides.FastOverviewState;
@@ -265,6 +267,14 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
controller, ALL_APPS_PROGRESS, startProgress, endProgress);
shiftAnim.setInterpolator(LINEAR);
anim.play(shiftAnim);
// Since we are changing the start position of the UI, reapply the state, at the end
anim.addListener(new AnimationSuccessListener() {
@Override
public void onAnimationSuccess(Animator animator) {
activity.getStateManager().reapplyState();
}
});
}
if (interactionType == INTERACTION_NORMAL) {