Merge "Fix wrong initial staged split position" into tm-dev
This commit is contained in:
@@ -28,7 +28,6 @@ import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRES
|
||||
import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
|
||||
import static com.android.launcher3.LauncherState.BACKGROUND_APP;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
|
||||
import static com.android.launcher3.Utilities.mapToRange;
|
||||
import static com.android.launcher3.Utilities.squaredHypot;
|
||||
@@ -3984,14 +3983,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
splitSelectSource.position.stagePosition);
|
||||
}
|
||||
|
||||
public PendingAnimation createSplitSelectInitAnimation() {
|
||||
public PendingAnimation createSplitSelectInitAnimation(int duration) {
|
||||
if (mSplitHiddenTaskView != null) {
|
||||
int duration = mActivity.getStateManager().getState().getTransitionDuration(
|
||||
getContext());
|
||||
return createTaskDismissAnimation(mSplitHiddenTaskView, true, false, duration,
|
||||
true /* dismissingForSplitSelection*/);
|
||||
} else {
|
||||
PendingAnimation anim = new PendingAnimation(SPLIT_LAUNCH_DURATION);
|
||||
PendingAnimation anim = new PendingAnimation(duration);
|
||||
createInitialSplitSelectAnimation(anim);
|
||||
return anim;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user