- Add vertical offset calculations to RecentsView (in addition to the existing horizontal offset which has been renamed accordingly). - LauncherState#getOverviewScaleAndOffset() now supports both horizontal and vertical offsets and is specified such that overview appears and disappears from the bottom of the screen rather than the side. - Quick switch still uses horizontal offset to come from the side. - No longer need to scroll to page 0 when translating offscreen. - Update interpolators for overview to home transition. - Align 2 button mode transition with 0 button mode. Test: Visually checking all of these. As appropriate, repeat in 0, 2, 3 button modes, landscape/portrait/fake landscape, and 3P launcher - Quick switch from home - Home to overview - Overview to home (swipe up) - Overview to home (tap outside) - Overview to home (back invocation) - Quick switch from app - Swipe up and hold from app - Dismiss an app - Empty recents - Split select state to home - Modal state to home Bug: 185411781 Change-Id: Ic59b877ccc0050afd7cd478778e9eeb60e2e47f7
177 lines
9.6 KiB
Java
177 lines
9.6 KiB
Java
/*
|
|
* Copyright (C) 2020 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.uioverrides.states;
|
|
|
|
import static android.view.View.VISIBLE;
|
|
|
|
import static com.android.launcher3.LauncherState.HINT_STATE;
|
|
import static com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON;
|
|
import static com.android.launcher3.LauncherState.NORMAL;
|
|
import static com.android.launcher3.LauncherState.OVERVIEW;
|
|
import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
|
|
import static com.android.launcher3.anim.Interpolators.ACCEL;
|
|
import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
|
|
import static com.android.launcher3.anim.Interpolators.DEACCEL;
|
|
import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
|
|
import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
|
|
import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
|
|
import static com.android.launcher3.anim.Interpolators.INSTANT;
|
|
import static com.android.launcher3.anim.Interpolators.LINEAR;
|
|
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
|
|
import static com.android.launcher3.anim.Interpolators.clampToProgress;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
|
|
import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
|
|
import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
|
|
|
|
import android.animation.ValueAnimator;
|
|
|
|
import com.android.launcher3.CellLayout;
|
|
import com.android.launcher3.Hotseat;
|
|
import com.android.launcher3.LauncherState;
|
|
import com.android.launcher3.Workspace;
|
|
import com.android.launcher3.states.StateAnimationConfig;
|
|
import com.android.launcher3.uioverrides.QuickstepLauncher;
|
|
import com.android.quickstep.SysUINavigationMode;
|
|
import com.android.quickstep.util.RecentsAtomicAnimationFactory;
|
|
import com.android.quickstep.views.RecentsView;
|
|
|
|
/**
|
|
* Animation factory for quickstep specific transitions
|
|
*/
|
|
public class QuickstepAtomicAnimationFactory extends
|
|
RecentsAtomicAnimationFactory<QuickstepLauncher, LauncherState> {
|
|
|
|
// Scale recents takes before animating in
|
|
private static final float RECENTS_PREPARE_SCALE = 1.33f;
|
|
// Scale workspace takes before animating in
|
|
private static final float WORKSPACE_PREPARE_SCALE_GESTURES = 0.97f;
|
|
private static final float WORKSPACE_PREPARE_SCALE_BUTTONS = 0.92f;
|
|
// When the overview to home transition reaches this percentage, immediately hide overview and
|
|
// start animating away the scrim and animating in workspace.
|
|
private static final float OVERVIEW_TO_HOME_HARD_HAND_OFF = 0.4f;
|
|
|
|
// Due to use of physics, duration may differ between devices so we need to calculate and
|
|
// cache the value.
|
|
private int mHintToNormalDuration = -1;
|
|
|
|
public QuickstepAtomicAnimationFactory(QuickstepLauncher activity) {
|
|
super(activity);
|
|
}
|
|
|
|
@Override
|
|
public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState,
|
|
StateAnimationConfig config) {
|
|
RecentsView overview = mActivity.getOverviewPanel();
|
|
if (toState == NORMAL && fromState == OVERVIEW) {
|
|
final float workspacePrepareScale;
|
|
if (SysUINavigationMode.getMode(mActivity).hasGestures
|
|
&& overview.getTaskViewCount() > 0) {
|
|
workspacePrepareScale = WORKSPACE_PREPARE_SCALE_GESTURES;
|
|
// Overview is going offscreen, so keep it at its current scale and opacity.
|
|
config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
|
|
config.setInterpolator(ANIM_OVERVIEW_FADE, clampToProgress(
|
|
FINAL_FRAME, 0f, OVERVIEW_TO_HOME_HARD_HAND_OFF));
|
|
config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(
|
|
DEACCEL, 0f, OVERVIEW_TO_HOME_HARD_HAND_OFF));
|
|
config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, AGGRESSIVE_EASE_IN_OUT);
|
|
config.setInterpolator(ANIM_SCRIM_FADE, clampToProgress(
|
|
DEACCEL, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
|
|
config.setInterpolator(ANIM_WORKSPACE_SCALE, clampToProgress(
|
|
DEACCEL, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
|
|
config.setInterpolator(ANIM_WORKSPACE_FADE, clampToProgress(
|
|
INSTANT, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
|
|
} else {
|
|
workspacePrepareScale = WORKSPACE_PREPARE_SCALE_BUTTONS;
|
|
config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
|
|
config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
|
|
config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
|
|
config.setInterpolator(ANIM_SCRIM_FADE, LINEAR);
|
|
config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
|
|
config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
|
|
}
|
|
|
|
Workspace workspace = mActivity.getWorkspace();
|
|
// Start from a higher workspace scale, but only if we're invisible so we don't jump.
|
|
boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;
|
|
if (isWorkspaceVisible) {
|
|
CellLayout currentChild = (CellLayout) workspace.getChildAt(
|
|
workspace.getCurrentPage());
|
|
isWorkspaceVisible = currentChild.getVisibility() == VISIBLE
|
|
&& currentChild.getShortcutsAndWidgets().getAlpha() > 0;
|
|
}
|
|
if (!isWorkspaceVisible) {
|
|
workspace.setScaleX(workspacePrepareScale);
|
|
workspace.setScaleY(workspacePrepareScale);
|
|
}
|
|
Hotseat hotseat = mActivity.getHotseat();
|
|
boolean isHotseatVisible = hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0;
|
|
if (!isHotseatVisible) {
|
|
hotseat.setScaleX(workspacePrepareScale);
|
|
hotseat.setScaleY(workspacePrepareScale);
|
|
}
|
|
} else if ((fromState == NORMAL || fromState == HINT_STATE
|
|
|| fromState == HINT_STATE_TWO_BUTTON) && toState == OVERVIEW) {
|
|
if (SysUINavigationMode.getMode(mActivity).hasGestures) {
|
|
config.setInterpolator(ANIM_WORKSPACE_SCALE,
|
|
fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
|
|
|
|
// Scrolling in tasks, so show straight away
|
|
if (overview.getTaskViewCount() > 0) {
|
|
config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
|
|
} else {
|
|
config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
|
|
}
|
|
} else {
|
|
config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
|
|
|
|
// Scale up the recents, if it is not coming from the side
|
|
if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {
|
|
RECENTS_SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
|
|
}
|
|
}
|
|
config.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_ALL_APPS_FADE, OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_SCRIM_FADE, t -> {
|
|
// Animate at the same rate until reaching progress 1, and skip the overshoot.
|
|
return Math.min(1, OVERSHOOT_1_2.getInterpolation(t));
|
|
});
|
|
config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2);
|
|
config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2);
|
|
} else if (fromState == HINT_STATE && toState == NORMAL) {
|
|
config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
|
|
if (mHintToNormalDuration == -1) {
|
|
ValueAnimator va = getSpringScaleAnimator(mActivity, mActivity.getWorkspace(),
|
|
toState.getWorkspaceScaleAndTranslation(mActivity).scale);
|
|
mHintToNormalDuration = (int) va.getDuration();
|
|
}
|
|
config.duration = Math.max(config.duration, mHintToNormalDuration);
|
|
}
|
|
}
|
|
}
|