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

Merge "Fixing taskbar unstashing after unfolding" into main

Browse Source
This commit is contained in:
Jagrut Desai
2024-02-28 15:21:40 +00:00
committed by Android (Google) Code Review
parent 7cc75c6a43 e424570af1
commit 07959348e6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,8 +310,16 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity);
boolean isInSetup = !mActivity.isUserSetupComplete() || setupUIVisible;
boolean isStashedInAppAuto =
isTransientTaskbar && !mTaskbarSharedState.getTaskbarWasPinned();
boolean taskbarWasPinned = mTaskbarSharedState.getTaskbarWasPinned();
boolean isStashedInAppAuto = isTransientTaskbar && !taskbarWasPinned;
// now that we know we need to keep transient taskbar unstashed after unpinning animation
// we need to reset the shared state, so everytime user recreates taskbar we don't unstash
// transient taskbar by default.
if (mTaskbarSharedState.getTaskbarWasPinned()) {
mTaskbarSharedState.setTaskbarWasPinned(false);
}
if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) {
isStashedInAppAuto = isStashedInAppAuto && mTaskbarSharedState.taskbarWasStashedAuto;
}
@@ -324,8 +332,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
// us that we're paused until a bit later. This avoids flickering upon recreating taskbar.
updateStateForFlag(FLAG_IN_APP, true);
applyState(/* duration = */ 0);
if (mTaskbarSharedState.getTaskbarWasPinned()
|| !mTaskbarSharedState.taskbarWasStashedAuto) {
if (taskbarWasPinned || !mTaskbarSharedState.taskbarWasStashedAuto) {
tryStartTaskbarTimeout();
}
notifyStashChange(/* visible */ false, /* stashed */ isStashedInApp());