PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Stash taskbar on swipe to go home for 3p fallback launcher."" into tm-qpr-dev am: c58e2be2dd am: 745010e6c9 am: 7ccd50dfb7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22119024

Change-Id: I16be5dd225d15a2b468ef8c67ad25045a08f6ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pat Manning
2023-03-18 00:06:38 +00:00
committed by Automerger Merge Worker
parent dff2310a7b 7ccd50dfb7
commit fe7a8239eb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java
+5 -6
View File
@@ -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). * 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) { public Animator createAnimToRecentsState(RecentsState toState, long duration) {
// Force stash the taskbar in overview modal state or when going home. boolean useStashedLauncherState = toState.hasOverviewActions();
boolean useStashedLauncherState = boolean stashedLauncherState =
toState.hasOverviewActions() || toState == RecentsState.HOME; useStashedLauncherState && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get()
boolean stashedLauncherState = useStashedLauncherState && ( && toState == RecentsState.MODAL_TASK;
(FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get() && toState == RecentsState.MODAL_TASK)
|| toState == RecentsState.HOME);
TaskbarStashController stashController = mControllers.taskbarStashController; TaskbarStashController stashController = mControllers.taskbarStashController;
// Set both FLAG_IN_STASHED_LAUNCHER_STATE and FLAG_IN_APP to ensure the state is respected. // 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). // For all other states, just use the current stashed-in-app setting (e.g. if long clicked).