Add kill switch

Author: joshliebe

saved-sites/saved-sites-impl/src/main/java/com/duckduckgo/savedsites/impl/newtab/FavoritesSwipeHandling.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.savedsites.impl.newtab
+
+import com.duckduckgo.anvil.annotations.ContributesRemoteFeature
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.feature.toggles.api.Toggle
+import com.duckduckgo.feature.toggles.api.Toggle.DefaultFeatureValue
+
+@ContributesRemoteFeature(
+    scope = AppScope::class,
+    featureName = "favoritesSwipeHandling",
+)
+interface FavoritesSwipeHandling {
+    /**
+     * Kill switch for intercepting touch events in Favorites section to allow swiping
+     * If disabled remotely, the interception will not be requested
+     * Defaults to `true`
+     */
+    @Toggle.DefaultValue(DefaultFeatureValue.TRUE)
+    fun self(): Toggle
+}

saved-sites/saved-sites-impl/src/main/java/com/duckduckgo/savedsites/impl/newtab/FavouritesNewTabSectionView.kt

@@ -112,6 +112,9 @@ class FavouritesNewTabSectionView @JvmOverloads constructor(
     @Inject
     lateinit var swipingTabsFeature: SwipingTabsFeatureProvider
 
+    @Inject
+    lateinit var favoritesSwipeHandling: FavoritesSwipeHandling
+
     private var isExpandable = true
     private var showPlaceholders = false
     private var placement: FavoritesPlacement = FavoritesPlacement.NEW_TAB_PAGE
@@ -196,34 +199,40 @@ class FavouritesNewTabSectionView @JvmOverloads constructor(
     }
 
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        if (!swipingTabsFeature.isEnabled) return super.dispatchTouchEvent(ev)
-
-        when (ev?.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-                viewModel.onTouchDown(ev.x, ev.y)
-                removeCallbacks(longPressRunnable)
-                postDelayed(longPressRunnable, longPressTimeoutMs)
-                parent?.requestDisallowInterceptTouchEvent(false)
-            }
+        val favoritesSwipeHandlingEnabled = favoritesSwipeHandling.self().isEnabled()
 
-            MotionEvent.ACTION_MOVE -> {
-                if (viewModel.isLongPressActive()) {
-                    parent?.requestDisallowInterceptTouchEvent(true)
-                } else {
-                    viewModel.onTouchMove(ev.x, ev.y, touchSlop)?.let { decision ->
-                        when (decision) {
-                            SwipeDecision.CANCEL_LONG_PRESS -> removeCallbacks(longPressRunnable)
-                            SwipeDecision.HORIZONTAL -> parent?.requestDisallowInterceptTouchEvent(false)
-                            SwipeDecision.VERTICAL -> parent?.requestDisallowInterceptTouchEvent(true)
+        if (swipingTabsFeature.isEnabled && !favoritesSwipeHandlingEnabled) {
+            parent?.requestDisallowInterceptTouchEvent(true)
+        }
+
+        if (favoritesSwipeHandlingEnabled) {
+            when (ev?.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    viewModel.onTouchDown(ev.x, ev.y)
+                    removeCallbacks(longPressRunnable)
+                    postDelayed(longPressRunnable, longPressTimeoutMs)
+                    parent?.requestDisallowInterceptTouchEvent(false)
+                }
+
+                MotionEvent.ACTION_MOVE -> {
+                    if (viewModel.isLongPressActive()) {
+                        parent?.requestDisallowInterceptTouchEvent(true)
+                    } else {
+                        viewModel.onTouchMove(ev.x, ev.y, touchSlop)?.let { decision ->
+                            when (decision) {
+                                SwipeDecision.CANCEL_LONG_PRESS -> removeCallbacks(longPressRunnable)
+                                SwipeDecision.HORIZONTAL -> parent?.requestDisallowInterceptTouchEvent(false)
+                                SwipeDecision.VERTICAL -> parent?.requestDisallowInterceptTouchEvent(true)
+                            }
                         }
                     }
                 }
-            }
 
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-                removeCallbacks(longPressRunnable)
-                viewModel.onTouchUp()
-                parent?.requestDisallowInterceptTouchEvent(false)
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                    removeCallbacks(longPressRunnable)
+                    viewModel.onTouchUp()
+                    parent?.requestDisallowInterceptTouchEvent(false)
+                }
             }
         }
         return super.dispatchTouchEvent(ev)