Revert "Suspend immersive mode autohide while pending transient taskbar timeout"

This reverts commit 0a074648c2.

Reason for revert: caused regression
Bug: 260765455
Fixes: 286808390

Change-Id: I0e017cf8e432f9c36b0ad34154c127c0dbe73504
This commit is contained in:
Jon Miranda
2023-06-13 20:09:58 +00:00
committed by Android (Google) Code Review
parent 0a074648c2
commit a6653ae660
2 changed files with 11 additions and 20 deletions
@@ -508,8 +508,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
return;
}
if (stash && mControllers.taskbarAutohideSuspendController
.isTransientTaskbarStashingSuspended()) {
if (stash && mControllers.taskbarAutohideSuspendController.isSuspended()
&& !mControllers.taskbarAutohideSuspendController
.isSuspendedForTransientTaskbarInOverview()) {
// Avoid stashing if autohide is currently suspended.
return;
}
@@ -1036,9 +1038,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
mActivity.getStatsLogManager().logger().log(hasAnyFlag(FLAG_STASHED_IN_APP_AUTO)
? LAUNCHER_TRANSIENT_TASKBAR_HIDE
: LAUNCHER_TRANSIENT_TASKBAR_SHOW);
mControllers.taskbarAutohideSuspendController.updateFlag(
TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR,
!hasAnyFlag(FLAG_STASHED_IN_APP_AUTO));
}
}
@@ -1131,7 +1130,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
private void onTaskbarTimeout(Alarm alarm) {
if (mControllers.taskbarAutohideSuspendController.isTransientTaskbarStashingSuspended()) {
if (mControllers.taskbarAutohideSuspendController.isSuspended()) {
return;
}
updateAndAnimateTransientTaskbar(true);