From 68a21ed11198cdecb0778198c72f0ed9f021a8b9 Mon Sep 17 00:00:00 2001 From: samcackett Date: Thu, 10 Apr 2025 10:58:53 +0100 Subject: [PATCH] Remove EnableHoverOfChildElementsInTaskview flag Fix: 409610713 Flag: EXEMPT. Flag removal Test: N/A Change-Id: Ifa924cb2011bb6e633ee5b79c17601be82b4a779 --- aconfig/launcher_overview.aconfig | 10 ----- .../android/quickstep/views/RecentsView.java | 5 +-- .../com/android/quickstep/views/TaskView.kt | 41 ++++--------------- 3 files changed, 10 insertions(+), 46 deletions(-) diff --git a/aconfig/launcher_overview.aconfig b/aconfig/launcher_overview.aconfig index 558602c412..f0ba238e71 100644 --- a/aconfig/launcher_overview.aconfig +++ b/aconfig/launcher_overview.aconfig @@ -22,16 +22,6 @@ flag { bug: "331753115" } -flag { - name: "enable_hover_of_child_elements_in_taskview" - namespace: "launcher_overview" - description: "Enables child elements to receive hover events in TaskView and respond visually to those hover events." - bug: "342594235" - metadata { - purpose: PURPOSE_BUGFIX - } -} - flag { name: "enable_large_desktop_windowing_tile" namespace: "launcher_overview" diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 2abb8a7284..5168cc7316 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -145,7 +145,6 @@ import com.android.internal.jank.Cuj; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BaseActivity.MultiWindowModeChangedListener; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; import com.android.launcher3.Insettable; import com.android.launcher3.PagedView; import com.android.launcher3.R; @@ -5292,9 +5291,7 @@ public abstract class RecentsView< mSplitHiddenTaskView.updateFullscreenParams(); }); } else if (isInitiatingSplitFromTaskView) { - if (Flags.enableHoverOfChildElementsInTaskview()) { - mSplitHiddenTaskView.setBorderEnabled(false); - } + mSplitHiddenTaskView.setBorderEnabled(false); // Splitting from Overview for fullscreen task if (enableExpressiveDismissTaskMotion() && (!showAsGrid() || enableGridOnlyOverview())) { diff --git a/quickstep/src/com/android/quickstep/views/TaskView.kt b/quickstep/src/com/android/quickstep/views/TaskView.kt index 0edd87bfe3..c01dc87b7d 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.kt +++ b/quickstep/src/com/android/quickstep/views/TaskView.kt @@ -46,7 +46,6 @@ import com.android.app.tracing.traceSection import com.android.launcher3.AbstractFloatingView import com.android.launcher3.Flags.enableCursorHoverStates import com.android.launcher3.Flags.enableDesktopExplodedView -import com.android.launcher3.Flags.enableHoverOfChildElementsInTaskview import com.android.launcher3.Flags.enableLargeDesktopWindowingTile import com.android.launcher3.Flags.enableRefactorTaskThumbnail import com.android.launcher3.Flags.enableSeparateExternalDisplayTasks @@ -604,17 +603,11 @@ constructor( if (borderEnabled) { when (event.action) { MotionEvent.ACTION_HOVER_ENTER -> { - hoverBorderVisible = - if (enableHoverOfChildElementsInTaskview()) { - getThumbnailBounds(thumbnailBounds) - event.isWithinThumbnailBounds() - } else { - true - } + getThumbnailBounds(thumbnailBounds) + hoverBorderVisible = event.isWithinThumbnailBounds() } MotionEvent.ACTION_HOVER_MOVE -> - if (enableHoverOfChildElementsInTaskview()) - hoverBorderVisible = event.isWithinThumbnailBounds() + hoverBorderVisible = event.isWithinThumbnailBounds() MotionEvent.ACTION_HOVER_EXIT -> hoverBorderVisible = false else -> {} } @@ -622,10 +615,6 @@ constructor( return super.onHoverEvent(event) } - override fun onInterceptHoverEvent(event: MotionEvent): Boolean = - if (enableHoverOfChildElementsInTaskview()) super.onInterceptHoverEvent(event) - else if (enableCursorHoverStates()) true else super.onInterceptHoverEvent(event) - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { val recentsView = recentsView ?: return false val splitSelectStateController = recentsView.splitSelectController @@ -670,9 +659,7 @@ constructor( it.right = width it.bottom = height } - if (enableHoverOfChildElementsInTaskview()) { - getThumbnailBounds(thumbnailBounds) - } + getThumbnailBounds(thumbnailBounds) } private fun updatePivots() { @@ -1583,10 +1570,8 @@ constructor( private fun showTaskMenuWithContainer(menuContainer: TaskContainer): Boolean { val recentsView = recentsView ?: return false - if (enableHoverOfChildElementsInTaskview()) { - // Disable hover on all TaskView's whilst menu is showing. - recentsView.setTaskBorderEnabled(false) - } + // Disable hover on all TaskView's whilst menu is showing. + recentsView.setTaskBorderEnabled(false) return if (enableOverviewIconMenu() && menuContainer.iconView is IconAppChipView) { if (menuContainer.iconView.status == AppChipStatus.Expanded) { closeTaskMenu() @@ -1595,9 +1580,7 @@ constructor( TaskMenuView.showForTask(menuContainer) { val isAnimated = !recentsView.isSplitSelectionActive menuContainer.iconView.revealAnim(/* isRevealing= */ false, isAnimated) - if (enableHoverOfChildElementsInTaskview()) { - recentsView.setTaskBorderEnabled(true) - } + recentsView.setTaskBorderEnabled(true) } } } else if (container.deviceProfile.isTablet) { @@ -1619,16 +1602,10 @@ constructor( 0 } TaskMenuViewWithArrow.showForTask(menuContainer, alignedOptionIndex) { - if (enableHoverOfChildElementsInTaskview()) { - recentsView.setTaskBorderEnabled(true) - } + recentsView.setTaskBorderEnabled(true) } } else { - TaskMenuView.showForTask(menuContainer) { - if (enableHoverOfChildElementsInTaskview()) { - recentsView.setTaskBorderEnabled(true) - } - } + TaskMenuView.showForTask(menuContainer) { recentsView.setTaskBorderEnabled(true) } } }