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:
@@ -697,7 +697,9 @@ public class TaskbarManager {
|
||||
private TaskbarUIController createTaskbarUIControllerForRecentsViewContainer(
|
||||
RecentsViewContainer container) {
|
||||
debugPrimaryTaskbar("createTaskbarUIControllerForRecentsViewContainer");
|
||||
if (container instanceof QuickstepLauncher quickstepLauncher) {
|
||||
if (mActivity instanceof QuickstepLauncher quickstepLauncher) {
|
||||
// If 1P Launcher is default, always use LauncherTaskbarUIController, regardless of
|
||||
// whether the recents container is NexusLauncherActivity or RecentsWindowManager.
|
||||
return new LauncherTaskbarUIController(quickstepLauncher);
|
||||
}
|
||||
// If a 3P Launcher is default, always use FallbackTaskbarUIController regardless of
|
||||
|
||||
Reference in New Issue
Block a user