From 39383dd5b3bddc15c4269baedd38faccd914112a Mon Sep 17 00:00:00 2001 From: mpodolian Date: Thu, 5 Sep 2024 11:02:23 -0700 Subject: [PATCH] Fix falling tapl tests Fix the root cause of falling tests. Bug: 359277238 Flag: TEST_ONLY Test: TaplTestsQuickstep,TaplTestPersistentTaskbar Change-Id: I1e3138e26d0ab253dff7a64cbb3253c220a7db1a --- .../launcher3/taskbar/TaskbarLauncherStateController.java | 7 ++++--- .../android/launcher3/taskbar/TaskbarStashController.java | 4 ++++ .../com/android/quickstep/TaplTestsPersistentTaskbar.java | 3 --- .../src/com/android/quickstep/TaplTestsQuickstep.java | 2 -- tests/tapl/com/android/launcher3/tapl/Taskbar.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 63fae8cad8..4188a0f61a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -463,7 +463,8 @@ public class TaskbarLauncherStateController { controllers.bubbleStashController.setBubblesShowingOnOverview(onOverview); }); - mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_OVERVIEW, + TaskbarStashController stashController = mControllers.taskbarStashController; + stashController.updateStateForFlag(FLAG_IN_OVERVIEW, mLauncherState == LauncherState.OVERVIEW); AnimatorSet animatorSet = new AnimatorSet(); @@ -495,8 +496,6 @@ public class TaskbarLauncherStateController { public void onAnimationStart(Animator animation) { mIsAnimatingToLauncher = isInLauncher; - TaskbarStashController stashController = - mControllers.taskbarStashController; if (DEBUG) { Log.d(TAG, "onAnimationStart - FLAG_IN_APP: " + !isInLauncher); } @@ -512,6 +511,8 @@ public class TaskbarLauncherStateController { // Handle closing open popups when going home/overview handleOpenFloatingViews = true; + } else { + stashController.applyState(); } if (handleOpenFloatingViews && isInLauncher) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 60e65b34a2..d07b011310 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -1137,6 +1137,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR, !hasAnyFlag(FLAG_STASHED_IN_APP_AUTO)); } + if (hasAnyFlag(changedFlags, FLAG_IN_OVERVIEW | FLAG_IN_APP)) { + mControllers.runAfterInit(() -> mControllers.taskbarInsetsController + .onTaskbarOrBubblebarWindowHeightOrInsetsChanged()); + } mActivity.applyForciblyShownFlagWhileTransientTaskbarUnstashed(!isStashedInApp()); } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java index c419cd2f76..a16811efaf 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java @@ -23,7 +23,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +30,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class TaplTestsPersistentTaskbar extends AbstractTaplTestsTaskbar { - //TODO(b/359277238): fix falling tests - @Ignore @Test @NavigationModeSwitch public void testTaskbarFillsWidth() { diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 943c1bd1b5..3e6436b7a5 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -516,8 +516,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { isInState(() -> LauncherState.NORMAL)); } - //TODO(b/359277238): fix falling tests - @Ignore @Test @PortraitLandscape @TaskbarModeSwitch diff --git a/tests/tapl/com/android/launcher3/tapl/Taskbar.java b/tests/tapl/com/android/launcher3/tapl/Taskbar.java index e6315f3d3b..b4aaab7a5c 100644 --- a/tests/tapl/com/android/launcher3/tapl/Taskbar.java +++ b/tests/tapl/com/android/launcher3/tapl/Taskbar.java @@ -52,7 +52,7 @@ public final class Taskbar { if (!mLauncher.isTransientTaskbar()) { Assert.assertEquals("Persistent taskbar should fill screen width", - getVisibleBounds().width(), mLauncher.getRealDisplaySize().x); + mLauncher.getRealDisplaySize().x, getVisibleBounds().width()); } }