aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 07:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update SUW swipe home logic for taskbar stashing" into 24D1-dev

Browse Source
This commit is contained in:
Tracy Zhou
2024-05-07 15:33:00 +00:00
committed by Android (Google) Code Review
parent 2155a925fc 6d3a1d8f50
commit 63da44e7eb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
View File

@@ -1452,7 +1452,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
((LauncherTaskbarUIController) uiController).addLauncherVisibilityChangedAnimation(
fullAnimation, duration);
}
mControllers.taskbarStashController.addUnstashToHotseatAnimation(fullAnimation, duration);
mControllers.taskbarStashController.addUnstashToHotseatAnimationFromSuw(fullAnimation,
duration);
View allAppsButton = mControllers.taskbarViewController.getAllAppsButtonView();
if (allAppsButton != null && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get()) {

6
quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
View File

@@ -357,7 +357,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
boolean hideTaskbar = isVisible || !mActivity.isUserSetupComplete();
updateStateForFlag(FLAG_IN_SETUP, hideTaskbar);
updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, hideTaskbar);
updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, mActivity.isPhoneGestureNavMode());
applyState(hideTaskbar ? 0 : getStashDuration());
}
@@ -549,11 +548,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* sub-animations are properly coordinated. This duration should not
* actually be used since this animation tracks a swipe progress.
*/
protected void addUnstashToHotseatAnimation(AnimatorSet animation, int placeholderDuration) {
protected void addUnstashToHotseatAnimationFromSuw(AnimatorSet animation,
int placeholderDuration) {
// Defer any UI updates now to avoid the UI becoming stale when the animation plays.
mControllers.taskbarViewController.setDeferUpdatesForSUW(true);
createAnimToIsStashed(
/* isStashed= */ false,
/* isStashed= */ mActivity.isPhoneMode(),
placeholderDuration,
TRANSITION_UNSTASH_SUW_MANUAL,
/* jankTag= */ "SUW_MANUAL");