From 67a1a3646c57cc15a35dddd5702f8a5f41d7a704 Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Thu, 10 Apr 2025 10:47:25 -0400 Subject: [PATCH] Clean up fully rolled out flag enable_handle_delayed_gesture_callbacks Flag: EXEMPT removing flag Bug: 409605707 Test: None; flag is already fully rolled out Change-Id: I06adfa8e0b88c14854fd80b1ccdcd6406c2cf2e9 --- aconfig/launcher.aconfig | 10 ---------- .../quickstep/TaskAnimationManager.java | 20 +++++++------------ .../quickstep/TouchInteractionService.java | 15 ++++++-------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index 269936179b..f75b7ab383 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -223,16 +223,6 @@ flag { bug: "323886237" } -flag { - name: "enable_handle_delayed_gesture_callbacks" - namespace: "launcher" - description: "Enables additional handling for delayed mid-gesture callbacks" - bug: "285636175" - metadata { - purpose: PURPOSE_BUGFIX - } -} - flag { name: "enable_fallback_overview_in_window" namespace: "lse_desktop_experience" diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index f2baf812a1..bd1b4918d6 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -17,7 +17,6 @@ package com.android.quickstep; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static com.android.launcher3.Flags.enableHandleDelayedGestureCallbacks; import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.NavigationMode.NO_BUTTON; @@ -184,7 +183,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn @Override public void onRecentsAnimationStart(RecentsAnimationController controller, RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { - if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { + if (mRecentsAnimationStartPending) { ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( "onRecentsAnimationStart"); mRecentsAnimationStartPending = false; @@ -229,7 +228,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn @Override public void onRecentsAnimationCanceled(HashMap thumbnailDatas) { - if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { + if (mRecentsAnimationStartPending) { ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( "onRecentsAnimationCanceled"); mRecentsAnimationStartPending = false; @@ -239,7 +238,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn @Override public void onRecentsAnimationFinished(RecentsAnimationController controller) { - if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { + if (mRecentsAnimationStartPending) { ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( "onRecentsAnimationFinished"); mRecentsAnimationStartPending = false; @@ -350,11 +349,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn mRecentsAnimationStartPending = getSystemUiProxy().startRecentsActivity(intent, options, mCallbacks, false /* useSyntheticRecentsTransition */); } - - if (enableHandleDelayedGestureCallbacks()) { - ActiveGestureProtoLogProxy.logSettingRecentsAnimationStartPending( - mRecentsAnimationStartPending); - } + ActiveGestureProtoLogProxy.logSettingRecentsAnimationStartPending( + mRecentsAnimationStartPending); gestureState.setState(STATE_RECENTS_ANIMATION_INITIALIZED); return mCallbacks; } @@ -549,10 +545,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn pw.println(prefix + "TaskAnimationManager:"); pw.println(prefix + "\tmDisplayId=" + mDisplayId); - if (enableHandleDelayedGestureCallbacks()) { - pw.println(prefix + "\tmRecentsAnimationStartPending=" + mRecentsAnimationStartPending); - pw.println(prefix + "\tmShouldIgnoreUpcomingGestures=" + mShouldIgnoreMotionEvents); - } + pw.println(prefix + "\tmRecentsAnimationStartPending=" + mRecentsAnimationStartPending); + pw.println(prefix + "\tmShouldIgnoreUpcomingGestures=" + mShouldIgnoreMotionEvents); if (mController != null) { mController.dump(prefix + '\t', pw); } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index c5197054b5..7ed6d12ec7 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -24,7 +24,6 @@ import static android.view.MotionEvent.ACTION_POINTER_UP; import static android.view.MotionEvent.ACTION_UP; import static com.android.launcher3.Flags.enableCursorHoverStates; -import static com.android.launcher3.Flags.enableHandleDelayedGestureCallbacks; import static com.android.launcher3.Flags.enableOverviewOnConnectedDisplays; import static com.android.launcher3.LauncherPrefs.backedUpItem; import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent; @@ -949,16 +948,14 @@ public class TouchInteractionService extends Service { ActiveGestureProtoLogProxy.logOnTaskAnimationManagerNotAvailable(displayId); return; } - if (enableHandleDelayedGestureCallbacks()) { + if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { + taskAnimationManager.notifyNewGestureStart(); + } + if (taskAnimationManager.shouldIgnoreMotionEvents()) { if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { - taskAnimationManager.notifyNewGestureStart(); - } - if (taskAnimationManager.shouldIgnoreMotionEvents()) { - if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { - ActiveGestureProtoLogProxy.logOnInputIgnoringFollowingEvents(displayId); - } - return; + ActiveGestureProtoLogProxy.logOnInputIgnoringFollowingEvents(displayId); } + return; } InputMonitorCompat inputMonitorCompat = getInputMonitorCompat(displayId);