summaryrefslogtreecommitdiff
path: root/quickstep/tests
diff options
context:
space:
mode:
author Tony Wickham <twickham@google.com> 2025-03-07 01:48:59 +0000
committer Tony Wickham <twickham@google.com> 2025-03-19 11:37:19 -0700
commit32888e1519e142f43a82c4e6ee2f3482142fc51c (patch)
tree8e7dc7c1ebdae67ea2fb9d2a299c01f7918b8c1e /quickstep/tests
parented79f7f269b395aa99d1c089ba0d5909dc2fdbb3 (diff)
Fix TaskarUIController being wrong with Overview-in-Window enabled
- isHomeAndOverviewSame now returns true for launcher in window - added isHomeAndOverviewSameActivity to differentiate specifically when Overview is hosted in the Launcher activity (currently only used for launcherChildTask handling, which we can clean up in a follow up change) - overviewIntent now equals homeIntent for launcher in window - fixed containerInterface to always use FallbackoverviewInWindow when overview-in-window is enabled; this means TaskbarManager gets the proper RecentsViewContainer for creating the correct TaskbarUIController - updated getSwipeUpHandlerFactory based on isHomeAndOverviewSame change above Fixes: 401382430 Test: InputConsumerUtilsTest, manual Flag: com.android.launcher3.enable_fallback_overview_in_window Flag: com.android.launcher3.enable_launcher_overview_in_window Change-Id: Ie8edd55b47d6438af36b9d2a788d72d69afa02f3
Diffstat (limited to 'quickstep/tests')
-rw-r--r--quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java
index 93b979cc32..1464ca8432 100644
--- a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java
@@ -293,7 +293,7 @@ public class InputConsumerUtilsTest {
@Test
public void testNewBaseConsumer_launcherChildActivityResumed_returnsDefaultInputConsumer() {
when(mRunningTask.isHomeTask()).thenReturn(true);
- when(mOverviewComponentObserver.isHomeAndOverviewSame()).thenReturn(true);
+ when(mOverviewComponentObserver.isHomeAndOverviewSameActivity()).thenReturn(true);
assertEqualsDefaultInputConsumer(this::createBaseInputConsumer);
}