Tony Wickham
2785a5996c
- Add NoButtonQuickSwitchTouchController which uses BothAxesSwipeDetector to track horizontal and vertical motion. - Initially, we only detect swipe left to right to quick switch (like before), but then we allow swipe up to either go to overview (if you hold) or back home (if you don't hold). - xDisplacement transitions non-overview components out (e.g. shelf and workspace), and translates overview in. - yDisplacement translates overview up and scales it down Bug: 126596417 Change-Id: Id679ad84c08246e205c667a78ed5df00d7276258 Merged-In: Id679ad84c08246e205c667a78ed5df00d7276258
223 lines
10 KiB
Java
223 lines
10 KiB
Java
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.launcher3;
|
|
|
|
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
|
|
import static com.android.launcher3.LauncherState.BACKGROUND_APP;
|
|
import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
|
|
import static com.android.launcher3.LauncherState.NORMAL;
|
|
import static com.android.launcher3.LauncherState.OVERVIEW;
|
|
import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
|
|
import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
|
|
import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
|
|
import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
|
|
import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
|
|
import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
|
|
import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
|
|
import static com.android.launcher3.anim.Interpolators.LINEAR;
|
|
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
|
|
import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
|
|
import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
|
|
|
|
import android.animation.Animator;
|
|
import android.animation.AnimatorListenerAdapter;
|
|
import android.animation.AnimatorSet;
|
|
import android.animation.ObjectAnimator;
|
|
import android.animation.ValueAnimator;
|
|
import android.content.Context;
|
|
import android.view.View;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
|
|
import com.android.launcher3.LauncherState.ScaleAndTranslation;
|
|
import com.android.launcher3.allapps.AllAppsTransitionController;
|
|
import com.android.launcher3.anim.AnimatorPlaybackController;
|
|
import com.android.launcher3.anim.AnimatorSetBuilder;
|
|
import com.android.launcher3.anim.Interpolators;
|
|
import com.android.launcher3.anim.SpringAnimationBuilder;
|
|
import com.android.quickstep.util.ClipAnimationHelper;
|
|
import com.android.quickstep.views.RecentsView;
|
|
import com.android.quickstep.views.TaskView;
|
|
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
|
|
|
/**
|
|
* A {@link QuickstepAppTransitionManagerImpl} that also implements recents transitions from
|
|
* {@link RecentsView}.
|
|
*/
|
|
public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {
|
|
|
|
public static final int INDEX_SHELF_ANIM = 0;
|
|
public static final int INDEX_RECENTS_FADE_ANIM = 1;
|
|
public static final int INDEX_RECENTS_TRANSLATE_X_ANIM = 2;
|
|
public static final int INDEX_PAUSE_TO_OVERVIEW_ANIM = 3;
|
|
|
|
public static final long ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW = 300;
|
|
|
|
public LauncherAppTransitionManagerImpl(Context context) {
|
|
super(context);
|
|
}
|
|
|
|
@Override
|
|
protected boolean isLaunchingFromRecents(@NonNull View v,
|
|
@Nullable RemoteAnimationTargetCompat[] targets) {
|
|
return mLauncher.getStateManager().getState().overviewUi
|
|
&& findTaskViewToLaunch(mLauncher, v, targets) != null;
|
|
}
|
|
|
|
@Override
|
|
protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
|
|
@NonNull RemoteAnimationTargetCompat[] targets, boolean launcherClosing) {
|
|
RecentsView recentsView = mLauncher.getOverviewPanel();
|
|
boolean skipLauncherChanges = !launcherClosing;
|
|
|
|
TaskView taskView = findTaskViewToLaunch(mLauncher, v, targets);
|
|
|
|
ClipAnimationHelper helper = new ClipAnimationHelper(mLauncher);
|
|
anim.play(getRecentsWindowAnimator(taskView, skipLauncherChanges, targets, helper)
|
|
.setDuration(RECENTS_LAUNCH_DURATION));
|
|
|
|
Animator childStateAnimation = null;
|
|
// Found a visible recents task that matches the opening app, lets launch the app from there
|
|
Animator launcherAnim;
|
|
final AnimatorListenerAdapter windowAnimEndListener;
|
|
if (launcherClosing) {
|
|
launcherAnim = recentsView.createAdjacentPageAnimForTaskLaunch(taskView, helper);
|
|
launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);
|
|
launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);
|
|
|
|
// Make sure recents gets fixed up by resetting task alphas and scales, etc.
|
|
windowAnimEndListener = new AnimatorListenerAdapter() {
|
|
@Override
|
|
public void onAnimationEnd(Animator animation) {
|
|
mLauncher.getStateManager().moveToRestState();
|
|
mLauncher.getStateManager().reapplyState();
|
|
}
|
|
};
|
|
} else {
|
|
AnimatorPlaybackController controller =
|
|
mLauncher.getStateManager().createAnimationToNewWorkspace(NORMAL,
|
|
RECENTS_LAUNCH_DURATION);
|
|
controller.dispatchOnStart();
|
|
childStateAnimation = controller.getTarget();
|
|
launcherAnim = controller.getAnimationPlayer().setDuration(RECENTS_LAUNCH_DURATION);
|
|
windowAnimEndListener = new AnimatorListenerAdapter() {
|
|
@Override
|
|
public void onAnimationEnd(Animator animation) {
|
|
mLauncher.getStateManager().goToState(NORMAL, false);
|
|
}
|
|
};
|
|
}
|
|
anim.play(launcherAnim);
|
|
|
|
// Set the current animation first, before adding windowAnimEndListener. Setting current
|
|
// animation adds some listeners which need to be called before windowAnimEndListener
|
|
// (the ordering of listeners matter in this case).
|
|
mLauncher.getStateManager().setCurrentAnimation(anim, childStateAnimation);
|
|
anim.addListener(windowAnimEndListener);
|
|
}
|
|
|
|
@Override
|
|
protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim, float[] alphas,
|
|
float[] trans) {
|
|
RecentsView overview = mLauncher.getOverviewPanel();
|
|
ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
|
|
RecentsView.CONTENT_ALPHA, alphas);
|
|
alpha.setDuration(CONTENT_ALPHA_DURATION);
|
|
alpha.setInterpolator(LINEAR);
|
|
anim.play(alpha);
|
|
overview.setFreezeViewVisibility(true);
|
|
|
|
ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
|
|
transY.setInterpolator(AGGRESSIVE_EASE);
|
|
transY.setDuration(CONTENT_TRANSLATION_DURATION);
|
|
anim.play(transY);
|
|
|
|
return () -> {
|
|
overview.setFreezeViewVisibility(false);
|
|
mLauncher.getStateManager().reapplyState();
|
|
};
|
|
}
|
|
|
|
@Override
|
|
public int getStateElementAnimationsCount() {
|
|
return 4;
|
|
}
|
|
|
|
@Override
|
|
public Animator createStateElementAnimation(int index, float... values) {
|
|
switch (index) {
|
|
case INDEX_SHELF_ANIM: {
|
|
AllAppsTransitionController aatc = mLauncher.getAllAppsController();
|
|
Animator springAnim = aatc.createSpringAnimation(values);
|
|
|
|
if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {
|
|
// Translate hotseat with the shelf until reaching overview.
|
|
float overviewProgress = OVERVIEW.getVerticalProgress(mLauncher);
|
|
ScaleAndTranslation sat = OVERVIEW.getHotseatScaleAndTranslation(mLauncher);
|
|
float shiftRange = aatc.getShiftRange();
|
|
if (values.length == 1) {
|
|
values = new float[] {aatc.getProgress(), values[0]};
|
|
}
|
|
ValueAnimator hotseatAnim = ValueAnimator.ofFloat(values);
|
|
hotseatAnim.addUpdateListener(anim -> {
|
|
float progress = (Float) anim.getAnimatedValue();
|
|
if (progress >= overviewProgress || mLauncher.isInState(BACKGROUND_APP)) {
|
|
float hotseatShift = (progress - overviewProgress) * shiftRange;
|
|
mLauncher.getHotseat().setTranslationY(hotseatShift + sat.translationY);
|
|
}
|
|
});
|
|
hotseatAnim.setInterpolator(LINEAR);
|
|
hotseatAnim.setDuration(springAnim.getDuration());
|
|
|
|
AnimatorSet anim = new AnimatorSet();
|
|
anim.play(hotseatAnim);
|
|
anim.play(springAnim);
|
|
return anim;
|
|
}
|
|
|
|
return springAnim;
|
|
}
|
|
case INDEX_RECENTS_FADE_ANIM:
|
|
return ObjectAnimator.ofFloat(mLauncher.getOverviewPanel(),
|
|
RecentsView.CONTENT_ALPHA, values);
|
|
case INDEX_RECENTS_TRANSLATE_X_ANIM:
|
|
return new SpringAnimationBuilder<>(mLauncher.getOverviewPanel(), VIEW_TRANSLATE_X)
|
|
.setDampingRatio(0.8f)
|
|
.setStiffness(250)
|
|
.setValues(values)
|
|
.build(mLauncher);
|
|
case INDEX_PAUSE_TO_OVERVIEW_ANIM: {
|
|
AnimatorSetBuilder builder = new AnimatorSetBuilder();
|
|
builder.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);
|
|
builder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);
|
|
if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {
|
|
builder.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);
|
|
builder.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);
|
|
}
|
|
LauncherStateManager stateManager = mLauncher.getStateManager();
|
|
return stateManager.createAtomicAnimation(
|
|
stateManager.getCurrentStableState(), OVERVIEW, builder,
|
|
ANIM_ALL, ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW);
|
|
}
|
|
|
|
default:
|
|
return super.createStateElementAnimation(index, values);
|
|
}
|
|
}
|
|
}
|