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
This commit is contained in:
Tony Wickham
2025-03-07 01:48:59 +00:00
parent ed79f7f269
commit 32888e1519
8 changed files with 53 additions and 21 deletions
@@ -544,7 +544,7 @@ public class ActiveGestureProtoLogProxy {
@NonNull Point displaySize, @NonNull RectF swipeRegion, @NonNull RectF ohmRegion,
int gesturalHeight, int largerGesturalHeight, @NonNull String reason) {
if (!enableActiveGestureProtoLog() || !isProtoLogInitialized()) return;
ProtoLog.d(ACTIVE_GESTURE_LOG,
ProtoLog.d(ACTIVE_GESTURE_LOG,
"OrientationTouchTransformer.createRegionForDisplay: "
+ "dispRot=%d, dispSize=%s, swipeRegion=%s, ohmRegion=%s, "
+ "gesturalHeight=%d, largerGesturalHeight=%d, reason=%s",
@@ -560,4 +560,14 @@ public class ActiveGestureProtoLogProxy {
ProtoLog.d(ACTIVE_GESTURE_LOG, "TaskAnimationManager not available for displayId=%d",
displayId);
}
public static void logGestureStartSwipeHandler(@NonNull String interactionHandler) {
ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString(
"OtherActivityInputConsumer.startTouchTrackingForWindowAnimation: "
+ "interactionHandler=%s", interactionHandler));
if (!enableActiveGestureProtoLog() || !isProtoLogInitialized()) return;
ProtoLog.d(ACTIVE_GESTURE_LOG,
"OtherActivityInputConsumer.startTouchTrackingForWindowAnimation: "
+ "interactionHandler=%s", interactionHandler);
}
}