Tony Wickham
02e9f1e12f
- Move Taskbar scale to LauncherState - Rename TaskbarVisibilityController to TaskbarAnimationController and add mTaskbarScaleForLauncherState to TaskbarAnimationController - Set OverviewState#getTaskbarScale() = 1f so Taskbar doesn't scale up when going from an app to Overview - Increase home animation duration so Taskbar animation aligns better Test: Taskbar scales up when going home, doesn't scale up when going to overview Bug: 182512211 Change-Id: I6f448e76de98d7ff337ae93234d4bb7ce6254d50
77 lines
3.0 KiB
Java
77 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2021 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.taskbar;
|
|
|
|
import static com.android.launcher3.LauncherState.TASKBAR;
|
|
import static com.android.launcher3.anim.Interpolators.LINEAR;
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
import com.android.launcher3.BaseQuickstepLauncher;
|
|
import com.android.launcher3.LauncherState;
|
|
import com.android.launcher3.anim.PendingAnimation;
|
|
import com.android.launcher3.statemanager.StateManager;
|
|
import com.android.launcher3.states.StateAnimationConfig;
|
|
import com.android.quickstep.AnimatedFloat;
|
|
|
|
/**
|
|
* StateHandler to animate Taskbar according to Launcher's state machine. Does nothing if Taskbar
|
|
* isn't present (i.e. {@link #setTaskbarCallbacks} is never called).
|
|
*/
|
|
public class TaskbarStateHandler implements StateManager.StateHandler<LauncherState> {
|
|
|
|
private final BaseQuickstepLauncher mLauncher;
|
|
|
|
// Contains Taskbar-related methods and fields we should aniamte. If null, don't do anything.
|
|
private @Nullable TaskbarController.TaskbarStateHandlerCallbacks mTaskbarCallbacks = null;
|
|
|
|
public TaskbarStateHandler(BaseQuickstepLauncher launcher) {
|
|
mLauncher = launcher;
|
|
}
|
|
|
|
public void setTaskbarCallbacks(TaskbarController.TaskbarStateHandlerCallbacks callbacks) {
|
|
mTaskbarCallbacks = callbacks;
|
|
}
|
|
|
|
@Override
|
|
public void setState(LauncherState state) {
|
|
if (mTaskbarCallbacks == null) {
|
|
return;
|
|
}
|
|
|
|
AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
|
|
AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
|
|
boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
|
|
alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
|
|
scaleTarget.updateValue(state.getTaskbarScale(mLauncher));
|
|
}
|
|
|
|
@Override
|
|
public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
|
|
PendingAnimation animation) {
|
|
if (mTaskbarCallbacks == null) {
|
|
return;
|
|
}
|
|
|
|
AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
|
|
AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
|
|
boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
|
|
animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
|
|
animation.setFloat(scaleTarget, AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher),
|
|
LINEAR);
|
|
}
|
|
}
|