From 3c9de6841c46fba53c88cc423d8d2e5aa23f0b97 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 9 Feb 2024 08:43:31 -0800 Subject: [PATCH] Clean up launcher state when ENABLE_HOME_TRANSITION_LISTENER is enabled. This prevents taskbar showing up on home screen. We already did this clean up when the flag is off, so now we're matching parity. Investigation for root cause is still on-going but for now this will fix the issue for TEAMFOODers. Bug: 279514548 Test: See bug for repo steps Flag: N/A Change-Id: I9a0c3b56f48b2c7c43e303978699124146c8b61b --- .../launcher3/taskbar/TaskbarLauncherStateController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 8e4a78fc0b..7a3385c045 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -222,8 +222,7 @@ public class TaskbarLauncherStateController { public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) { // TODO(b/279514548) Cleans up bad state that can occur when user interacts with // taskbar on top of transparent activity. - if (!FeatureFlags.enableHomeTransitionListener() - && (finalState == LauncherState.NORMAL) + if ((finalState == LauncherState.NORMAL) && mLauncher.hasBeenResumed()) { updateStateForFlag(FLAG_VISIBLE, true); applyState();