Merge "Cleaning up useActivityOverlay flag" into main

This commit is contained in:
Treehugger Robot
2025-04-16 19:00:18 -07:00
committed by Android (Google) Code Review
3 changed files with 4 additions and 16 deletions
-7
View File
@@ -166,13 +166,6 @@ flag {
}
}
flag {
name: "use_activity_overlay"
namespace: "launcher"
description: "Use an activity for home screen overlay"
bug: "273828110"
}
flag {
name: "enable_grid_migration_fix"
namespace: "launcher"
@@ -133,10 +133,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
}
mHomeState.addListener(mVisibilityChangeListener);
onLauncherVisibilityChanged(
Flags.useActivityOverlay()
? mHomeState.isHomeVisible() : mLauncher.hasBeenResumed(),
true /* fromInit */);
onLauncherVisibilityChanged(mHomeState.isHomeVisible(), true /* fromInit */);
onStashedInAppChanged(mLauncher.getDeviceProfile());
mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener);
@@ -295,8 +292,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
@Override
public void refreshResumedState() {
onLauncherVisibilityChanged(Flags.useActivityOverlay()
? mHomeState.isHomeVisible() : mLauncher.hasBeenResumed());
onLauncherVisibilityChanged(mHomeState.isHomeVisible());
}
@Override
@@ -552,12 +552,11 @@ object InputConsumerUtils {
container.isResumed() && !previousGestureState.isRecentsAnimationRunning
// If a task fragment within Launcher is resumed
val launcherChildActivityResumed =
(com.android.launcher3.Flags.useActivityOverlay() &&
runningTask != null &&
runningTask != null &&
runningTask.isHomeTask &&
!previousGestureState.isRecentsAnimationRunning &&
overviewComponentObserver.isHomeAndOverviewSame &&
container.isLauncherOverlayShowing)
container.isLauncherOverlayShowing
return if (container.isInLiveTileMode()) {
createOverviewInputConsumer<S, T>(