Merge "Revert "Stash taskbar on swipe to go home for 3p fallback launcher."" into tm-qpr-dev am: c58e2be2dd am: 745010e6c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22119024 Change-Id: I1eeb16d2c17576dbccbf760d6ca91f35849b046b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -77,14 +77,13 @@ public class FallbackTaskbarUIController extends TaskbarUIController {
|
||||
|
||||
/**
|
||||
* Creates an animation to animate the taskbar for the given state (but does not start it).
|
||||
* Currently this animation just force stashes the taskbar in Overview.
|
||||
*/
|
||||
public Animator createAnimToRecentsState(RecentsState toState, long duration) {
|
||||
// Force stash the taskbar in overview modal state or when going home.
|
||||
boolean useStashedLauncherState =
|
||||
toState.hasOverviewActions() || toState == RecentsState.HOME;
|
||||
boolean stashedLauncherState = useStashedLauncherState && (
|
||||
(FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get() && toState == RecentsState.MODAL_TASK)
|
||||
|| toState == RecentsState.HOME);
|
||||
boolean useStashedLauncherState = toState.hasOverviewActions();
|
||||
boolean stashedLauncherState =
|
||||
useStashedLauncherState && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get()
|
||||
&& toState == RecentsState.MODAL_TASK;
|
||||
TaskbarStashController stashController = mControllers.taskbarStashController;
|
||||
// Set both FLAG_IN_STASHED_LAUNCHER_STATE and FLAG_IN_APP to ensure the state is respected.
|
||||
// For all other states, just use the current stashed-in-app setting (e.g. if long clicked).
|
||||
|
||||
Reference in New Issue
Block a user