aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abstracting StatefulActivity from StateManager

Browse Source 
Flag: NONE - abstraction with no logic changes.

Test: Built and ran locally, for launcher3 and third party launchers

Bug: 224595066

Change-Id: I9da15bdd649d3a20e98c6552bb9e9abaec72f97f
This commit is contained in:
randypfohl
2024-05-08 14:50:50 -07:00
parent ea913b3dee
commit 176ce85d27
22 changed files with 160 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt
View File

@@ -35,7 +35,7 @@ import java.util.function.Consumer
/** Manage recents related operations with desktop tasks */
class DesktopRecentsTransitionController(
private val stateManager: StateManager<*>,
private val stateManager: StateManager<*, *>,
private val systemUiProxy: SystemUiProxy,
private val appThread: IApplicationThread,
private val depthController: DepthController?
@@ -64,7 +64,7 @@ class DesktopRecentsTransitionController(
private class RemoteDesktopLaunchTransitionRunner(
private val desktopTaskView: DesktopTaskView,
private val stateManager: StateManager<*>,
private val stateManager: StateManager<*, *>,
private val depthController: DepthController?,
private val successCallback: Consumer<Boolean>?
) : RemoteTransitionStub() {

2
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
View File

@@ -1118,7 +1118,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer
}
@Override
protected void collectStateHandlers(List<StateHandler> out) {
public void collectStateHandlers(List<StateHandler<LauncherState>> out) {
super.collectStateHandlers(out);
out.add(getDepthController());
out.add(new RecentsViewStateController(this));

3
quickstep/src/com/android/quickstep/FallbackActivityInterface.java
View File

@@ -154,7 +154,8 @@ public final class FallbackActivityInterface extends
@Override
public void onExitOverview(RotationTouchHelper deviceState, Runnable exitRunnable) {
final StateManager<RecentsState> stateManager = getCreatedContainer().getStateManager();
final StateManager<RecentsState, RecentsActivity> stateManager =
getCreatedContainer().getStateManager();
if (stateManager.getState() == HOME) {
exitRunnable.run();
notifyRecentsOfOrientation(deviceState);

4
quickstep/src/com/android/quickstep/LauncherActivityInterface.java
View File

@@ -36,6 +36,7 @@ import androidx.annotation.UiThread;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Flags;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAnimUtils;
import com.android.launcher3.LauncherInitListener;
import com.android.launcher3.LauncherState;
@@ -242,7 +243,8 @@ public final class LauncherActivityInterface extends
@Override
public void onExitOverview(RotationTouchHelper deviceState, Runnable exitRunnable) {
final StateManager<LauncherState> stateManager = getCreatedContainer().getStateManager();
final StateManager<LauncherState, Launcher> stateManager =
getCreatedContainer().getStateManager();
stateManager.addStateListener(
new StateManager.StateListener<LauncherState>() {
@Override

5
quickstep/src/com/android/quickstep/OverviewCommandHelper.java
View File

@@ -228,8 +228,9 @@ public class OverviewCommandHelper {
}
BaseActivityInterface<?, T> activityInterface =
mOverviewComponentObserver.getActivityInterface();
RecentsView visibleRecentsView = activityInterface.getVisibleRecentsView();
RecentsView createdRecentsView;
RecentsView<?, ?> visibleRecentsView = activityInterface.getVisibleRecentsView();
RecentsView<?, ?> createdRecentsView;
Log.d(TAG, "executeCommand: " + cmd
+ " - visibleRecentsView: " + visibleRecentsView);

11
quickstep/src/com/android/quickstep/RecentsActivity.java
View File

@@ -115,7 +115,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem
private TISBindHelper mTISBindHelper;
private @Nullable FallbackTaskbarUIController mTaskbarUIController;
private StateManager<RecentsState> mStateManager;
private StateManager<RecentsState, RecentsActivity> mStateManager;
// Strong refs to runners which are cleared when the activity is destroyed
private RemoteAnimationFactory mActivityLaunchAnimationRunner;
@@ -386,6 +386,11 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem
}
}
@Override
public boolean shouldAnimateStateChange() {
return false;
}
/**
* Initialize/update the device profile.
*/
@@ -462,12 +467,12 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem
};
@Override
protected void collectStateHandlers(List<StateHandler> out) {
public void collectStateHandlers(List<StateHandler<RecentsState>> out) {
out.add(new FallbackRecentsStateController(this));
}
@Override
public StateManager<RecentsState> getStateManager() {
public StateManager<RecentsState, RecentsActivity> getStateManager() {
return mStateManager;
}

2
quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
View File

@@ -93,7 +93,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
}
@Override
public StateManager<RecentsState> getStateManager() {
public StateManager<RecentsState, RecentsActivity> getStateManager() {
return mContainer.getStateManager();
}

4
quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
View File

@@ -39,6 +39,7 @@ import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatorPlaybackController;
import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.statemanager.StateManager;
import com.android.launcher3.statemanager.StatefulActivity;
import com.android.launcher3.states.StateAnimationConfig;
import com.android.launcher3.touch.AllAppsSwipeController;
import com.android.quickstep.DeviceConfigWrapper;
@@ -163,7 +164,8 @@ public class AnimatorControllerWithResistance {
recentsOrientedState.getContainerInterface().getCreatedContainer();
if (container != null) {
RecentsView recentsView = container.getOverviewPanel();
StateManager<LauncherState> stateManager = recentsView.getStateManager();
StateManager<LauncherState, StatefulActivity<LauncherState>> stateManager =
recentsView.getStateManager();
if (stateManager.isInStableState(LauncherState.BACKGROUND_APP)
&& stateManager.isInTransition()) {

2
quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
View File

@@ -62,7 +62,7 @@ public class OverviewToHomeAnim {
* {@link WorkspaceRevealAnim}.
*/
public void animateWithVelocity(float velocity) {
StateManager<LauncherState> stateManager = mLauncher.getStateManager();
StateManager<LauncherState, Launcher> stateManager = mLauncher.getStateManager();
LauncherState startState = stateManager.getState();
if (startState != OVERVIEW) {
Log.e(TAG, "animateFromOverviewToHome: unexpected start state " + startState);

3
quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
View File

@@ -27,6 +27,7 @@ import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_COUNT;
import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_SEEN;
import static com.android.launcher3.util.OnboardingPrefs.HOTSEAT_DISCOVERY_TIP_COUNT;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.LauncherState;
import com.android.launcher3.Utilities;
@@ -48,7 +49,7 @@ public class QuickstepOnboardingPrefs {
* Sets up the initial onboarding behavior for the launcher
*/
public static void setup(QuickstepLauncher launcher) {
StateManager<LauncherState> stateManager = launcher.getStateManager();
StateManager<LauncherState, Launcher> stateManager = launcher.getStateManager();
if (!HOME_BOUNCE_SEEN.get(launcher)) {
stateManager.addStateListener(new StateListener<LauncherState>() {
@Override

6
quickstep/src/com/android/quickstep/util/SplitAnimationController.kt
View File

@@ -510,7 +510,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
apps: Array<RemoteAnimationTarget>?,
wallpapers: Array<RemoteAnimationTarget>?,
nonApps: Array<RemoteAnimationTarget>?,
stateManager: StateManager<*>,
stateManager: StateManager<*, *>,
depthController: DepthController?,
info: TransitionInfo?,
t: Transaction?,
@@ -589,7 +589,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
@VisibleForTesting
fun composeRecentsSplitLaunchAnimator(
launchingTaskView: GroupedTaskView,
stateManager: StateManager<*>,
stateManager: StateManager<*, *>,
depthController: DepthController?,
info: TransitionInfo,
t: Transaction,
@@ -617,7 +617,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
apps: Array<RemoteAnimationTarget>,
wallpapers: Array<RemoteAnimationTarget>,
nonApps: Array<RemoteAnimationTarget>,
stateManager: StateManager<*>,
stateManager: StateManager<*, *>,
depthController: DepthController?,
finishCallback: Runnable
) {

3
quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
View File

@@ -37,6 +37,7 @@ import android.view.MotionEvent;
import androidx.annotation.Nullable;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.desktop.DesktopRecentsTransitionController;
@@ -104,7 +105,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
}
@Override
public StateManager<LauncherState> getStateManager() {
public StateManager<LauncherState, Launcher> getStateManager() {
return mContainer.getStateManager();
}

5
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@@ -152,6 +152,7 @@ import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.statehandlers.DepthController;
import com.android.launcher3.statemanager.BaseState;
import com.android.launcher3.statemanager.StateManager;
import com.android.launcher3.statemanager.StatefulContainer;
import com.android.launcher3.testing.TestLogging;
import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.touch.OverScroll;
@@ -2487,7 +2488,9 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
/** Returns whether user can start home based on state in {@link OverviewCommandHelper}. */
protected abstract boolean canStartHomeSafely();
public abstract StateManager<STATE_TYPE> getStateManager();
/** Returns the state manager used in RecentsView **/
public abstract StateManager<STATE_TYPE,
? extends StatefulContainer<STATE_TYPE>> getStateManager();
public void reset() {
setCurrentTask(-1);

6
src/com/android/launcher3/Launcher.java
View File

@@ -312,7 +312,7 @@ public class Launcher extends StatefulActivity<LauncherState>
private static boolean sIsNewProcess = true;
private StateManager<LauncherState> mStateManager;
private StateManager<LauncherState, Launcher> mStateManager;
private static final int ON_ACTIVITY_RESULT_ANIMATION_DELAY = 500;
@@ -2775,7 +2775,7 @@ public class Launcher extends StatefulActivity<LauncherState>
}
@Override
protected void collectStateHandlers(List<StateHandler> out) {
public void collectStateHandlers(List<StateHandler<LauncherState>> out) {
out.add(getAllAppsController());
out.add(getWorkspace());
}
@@ -2996,7 +2996,7 @@ public class Launcher extends StatefulActivity<LauncherState>
}
@Override
public StateManager<LauncherState> getStateManager() {
public StateManager<LauncherState, Launcher> getStateManager() {
return mStateManager;
}

6
src/com/android/launcher3/LauncherState.java
View File

@@ -440,7 +440,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
*/
public void onBackInvoked(Launcher launcher) {
if (this != NORMAL) {
StateManager<LauncherState> lsm = launcher.getStateManager();
StateManager<LauncherState, Launcher> lsm = launcher.getStateManager();
LauncherState lastState = lsm.getLastState();
lsm.goToState(lastState, forEndCallback(this::onBackAnimationCompleted));
}
@@ -461,7 +461,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
*/
public void onBackProgressed(
Launcher launcher, @FloatRange(from = 0.0, to = 1.0) float backProgress) {
StateManager<LauncherState> lsm = launcher.getStateManager();
StateManager<LauncherState, Launcher> lsm = launcher.getStateManager();
LauncherState toState = lsm.getLastState();
lsm.onBackProgressed(toState, backProgress);
}
@@ -471,7 +471,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
* predictive back gesture.
*/
public void onBackCancelled(Launcher launcher) {
StateManager<LauncherState> lsm = launcher.getStateManager();
StateManager<LauncherState, Launcher> lsm = launcher.getStateManager();
LauncherState toState = lsm.getLastState();
lsm.onBackCancelled(toState);
}

2
src/com/android/launcher3/Workspace.java
View File

@@ -526,7 +526,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
}
updateChildrenLayersEnabled();
StateManager<LauncherState> stateManager = mLauncher.getStateManager();
StateManager<LauncherState, Launcher> stateManager = mLauncher.getStateManager();
stateManager.addStateListener(new StateManager.StateListener<LauncherState>() {
@Override
public void onStateTransitionComplete(LauncherState finalState) {

8
src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
View File

@@ -56,7 +56,7 @@ public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<L
return false;
}
Launcher launcher = mActivityContext;
StateManager<LauncherState> manager = launcher.getStateManager();
StateManager<LauncherState, Launcher> manager = launcher.getStateManager();
if (manager.isInTransition() && manager.getTargetState() != null) {
return manager.getTargetState().shouldFloatingSearchBarUsePillWhenUnfocused(launcher);
}
@@ -70,7 +70,7 @@ public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<L
return super.getFloatingSearchBarRestingMarginBottom();
}
Launcher launcher = mActivityContext;
StateManager<LauncherState> stateManager = launcher.getStateManager();
StateManager<LauncherState, Launcher> stateManager = launcher.getStateManager();
// We want to rest at the current state's resting position, unless we are in transition and
// the target state's resting position is higher (that way if we are closing the keyboard,
@@ -95,7 +95,7 @@ public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<L
return super.getFloatingSearchBarRestingMarginStart();
}
StateManager<LauncherState> stateManager = mActivityContext.getStateManager();
StateManager<LauncherState, Launcher> stateManager = mActivityContext.getStateManager();
// Special case to not expand the search bar when exiting All Apps on phones.
if (stateManager.getCurrentStableState() == LauncherState.ALL_APPS
@@ -117,7 +117,7 @@ public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<L
return super.getFloatingSearchBarRestingMarginEnd();
}
StateManager<LauncherState> stateManager = mActivityContext.getStateManager();
StateManager<LauncherState, Launcher> stateManager = mActivityContext.getStateManager();
// Special case to not expand the search bar when exiting All Apps on phones.
if (stateManager.getCurrentStableState() == LauncherState.ALL_APPS

2
src/com/android/launcher3/statemanager/BaseState.java
View File

@@ -21,7 +21,7 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.views.ActivityContext;
/**
* Interface representing a state of a StatefulActivity
* Interface representing a state of a StatefulContainer
*/
public interface BaseState<T extends BaseState> {

34
src/com/android/launcher3/statemanager/StateManager.java
View File

@@ -26,6 +26,7 @@ import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
@@ -47,8 +48,11 @@ import java.util.stream.Collectors;
/**
* Class to manage transitions between different states for a StatefulActivity based on different
* states
* @param STATE_TYPE Basestate used by the state manager
* @param STATEFUL_CONTAINER container object used to manage state
*/
public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>,
STATEFUL_CONTAINER extends Context & StatefulContainer<STATE_TYPE>> {
public static final String TAG = "StateManager";
// b/279059025, b/325463989
@@ -56,7 +60,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
private final AnimationState mConfig = new AnimationState();
private final Handler mUiHandler;
private final StatefulActivity<STATE_TYPE> mActivity;
private final STATEFUL_CONTAINER mStatefulContainer;
private final ArrayList<StateListener<STATE_TYPE>> mListeners = new ArrayList<>();
private final STATE_TYPE mBaseState;
@@ -71,12 +75,12 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
private STATE_TYPE mRestState;
public StateManager(StatefulActivity<STATE_TYPE> l, STATE_TYPE baseState) {
public StateManager(STATEFUL_CONTAINER container, STATE_TYPE baseState) {
mUiHandler = new Handler(Looper.getMainLooper());
mActivity = l;
mStatefulContainer = container;
mBaseState = baseState;
mState = mLastStableState = mCurrentStableState = baseState;
mAtomicAnimationFactory = l.createAtomicAnimationFactory();
mAtomicAnimationFactory = container.createAtomicAnimationFactory();
}
public STATE_TYPE getState() {
@@ -109,10 +113,10 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
writer.println(prefix + "\tisInTransition:" + isInTransition());
}
public StateHandler[] getStateHandlers() {
public StateHandler<STATE_TYPE>[] getStateHandlers() {
if (mStateHandlers == null) {
ArrayList<StateHandler> handlers = new ArrayList<>();
mActivity.collectStateHandlers(handlers);
ArrayList<StateHandler<STATE_TYPE>> handlers = new ArrayList<>();
mStatefulContainer.collectStateHandlers(handlers);
mStateHandlers = handlers.toArray(new StateHandler[handlers.size()]);
}
return mStateHandlers;
@@ -130,7 +134,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
* Returns true if the state changes should be animated.
*/
public boolean shouldAnimateStateChange() {
return !mActivity.isForceInvisible() && mActivity.isStarted();
return mStatefulContainer.shouldAnimateStateChange();
}
/**
@@ -245,7 +249,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
}
animated &= areAnimatorsEnabled();
if (mActivity.isInState(state)) {
if (mStatefulContainer.isInState(state)) {
if (mConfig.currentAnimation == null) {
// Run any queued runnable
if (listener != null) {
@@ -302,8 +306,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
// Since state mBaseState can be reached from multiple states, just assume that the
// transition plays in reverse and use the same duration as previous state.
mConfig.duration = state == mBaseState
? fromState.getTransitionDuration(mActivity, false /* isToState */)
: state.getTransitionDuration(mActivity, true /* isToState */);
? fromState.getTransitionDuration(mStatefulContainer, false /* isToState */)
: state.getTransitionDuration(mStatefulContainer, true /* isToState */);
prepareForAtomicAnimation(fromState, state, mConfig);
AnimatorSet animation = createAnimationToNewWorkspaceInternal(state).buildAnim();
if (listener != null) {
@@ -336,7 +340,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
PendingAnimation builder = new PendingAnimation(config.duration);
prepareForAtomicAnimation(fromState, toState, config);
for (StateHandler handler : mActivity.getStateManager().getStateHandlers()) {
for (StateHandler handler : mStatefulContainer.getStateManager().getStateHandlers()) {
handler.setStateWithAnimation(toState, config, builder);
}
return builder.buildAnim();
@@ -402,7 +406,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
private void onStateTransitionStart(STATE_TYPE state) {
mState = state;
mActivity.onStateSetStart(mState);
mStatefulContainer.onStateSetStart(mState);
if (DEBUG) {
Log.d(TAG, "onStateTransitionStart - state: " + state);
@@ -419,7 +423,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
mCurrentStableState = state;
}
mActivity.onStateSetEnd(state);
mStatefulContainer.onStateSetEnd(state);
if (state == mBaseState) {
setRestState(null);
}

37
src/com/android/launcher3/statemanager/StatefulActivity.java
View File

@@ -18,7 +18,6 @@ package com.android.launcher3.statemanager;
import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
import static com.android.launcher3.LauncherState.FLAG_CLOSE_POPUPS;
import static com.android.launcher3.LauncherState.FLAG_NON_INTERACTIVE;
import android.content.res.Configuration;
@@ -29,11 +28,9 @@ import android.view.View;
import androidx.annotation.CallSuper;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.BaseDraggingActivity;
import com.android.launcher3.LauncherRootView;
import com.android.launcher3.Utilities;
import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
import com.android.launcher3.statemanager.StateManager.StateHandler;
import com.android.launcher3.util.window.WindowManagerProxy;
import com.android.launcher3.views.BaseDragLayer;
@@ -45,7 +42,7 @@ import java.util.List;
* @param <STATE_TYPE> Type of state object
*/
public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
extends BaseDraggingActivity {
extends BaseDraggingActivity implements StatefulContainer<STATE_TYPE> {
public final Handler mHandler = new Handler();
private final Runnable mHandleDeferredResume = this::handleDeferredResume;
@@ -67,19 +64,9 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
/**
* Create handlers to control the property changes for this activity
*/
protected abstract void collectStateHandlers(List<StateHandler> out);
/**
* Returns true if the activity is in the provided state
*/
public boolean isInState(STATE_TYPE state) {
return getStateManager().getState() == state;
}
/**
* Returns the state manager for this activity
*/
public abstract StateManager<STATE_TYPE> getStateManager();
@Override
public abstract void collectStateHandlers(List<StateHandler<STATE_TYPE>> out);
protected void inflateRootView(int layoutId) {
mRootView = (LauncherRootView) LayoutInflater.from(this).inflate(layoutId, null);
@@ -106,22 +93,12 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
if (mDeferredResumePending) {
handleDeferredResume();
}
if (state.hasFlag(FLAG_CLOSE_POPUPS)) {
AbstractFloatingView.closeAllOpenViews(this, !state.hasFlag(FLAG_NON_INTERACTIVE));
}
StatefulContainer.super.onStateSetStart(state);
}
/**
* Called when transition to state ends
*/
public void onStateSetEnd(STATE_TYPE state) { }
/**
* Creates a factory for atomic state animations
*/
public AtomicAnimationFactory<STATE_TYPE> createAtomicAnimationFactory() {
return new AtomicAnimationFactory(0);
@Override
public boolean shouldAnimateStateChange() {
return !isForceInvisible() && isStarted();
}
@Override

84
src/com/android/launcher3/statemanager/StatefulContainer.java Normal file
View File

@@ -0,0 +1,84 @@
/*
* Copyright (C) 2024 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.statemanager;
import static com.android.launcher3.LauncherState.FLAG_CLOSE_POPUPS;
import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE;
import androidx.annotation.CallSuper;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.views.ActivityContext;
import java.util.List;
/**
* Interface for a container that can be managed by a state manager.
*
* @param <STATE_TYPE> The type of state that the container can be in.
*/
public interface StatefulContainer<STATE_TYPE extends BaseState<STATE_TYPE>> extends
ActivityContext {
/**
* Creates a factory for atomic state animations
*/
default StateManager.AtomicAnimationFactory<STATE_TYPE> createAtomicAnimationFactory() {
return new StateManager.AtomicAnimationFactory<>(0);
}
/**
* Create handlers to control the property changes for this activity
*/
void collectStateHandlers(List<StateManager.StateHandler<STATE_TYPE>> out);
/**
* Retrieves state manager for given container
*/
StateManager<STATE_TYPE, ?> getStateManager();
/**
* Called when transition to state ends
* @param state current state of State_Type
*/
default void onStateSetEnd(STATE_TYPE state) { }
/**
* Called when transition to state starts
* @param state current state of State_Type
*/
@CallSuper
default void onStateSetStart(STATE_TYPE state) {
if (state.hasFlag(FLAG_CLOSE_POPUPS)) {
AbstractFloatingView.closeAllOpenViews(this, !state.hasFlag(FLAG_NON_INTERACTIVE));
}
}
/**
* Returns true if the activity is in the provided state
* @param state current state of State_Type
*/
default boolean isInState(STATE_TYPE state) {
return getStateManager().getState() == state;
}
/**
* Returns true if state change should transition with animation
*/
boolean shouldAnimateStateChange();
}

7
src/com/android/launcher3/util/CannedAnimationCoordinator.kt
View File

@@ -113,10 +113,9 @@ class CannedAnimationCoordinator(private val activity: StatefulActivity<*>) {
// flags accordingly
animationController =
controller.apply {
activity.stateManager.setCurrentAnimation(
this,
USER_CONTROLLED or HANDLE_STATE_APPLY
)
activity
.stateManager
.setCurrentAnimation(this, USER_CONTROLLED or HANDLE_STATE_APPLY)
}
recreateAnimation(provider)
}