ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #10344 - Enable tab reordering in beta/release

This commit is contained in:
DreVla 2022-11-01 12:50:12 +02:00 committed by mergify[bot]
parent a5c1c578bd
commit bc76907605
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
View File

@ -66,11 +66,6 @@ object FeatureFlags {
*/
const val inactiveTabs = true
/**
* Allows tabs to be dragged around as long as tab groups are disabled
*/
val tabReorderingFeature = Config.channel.isNightlyOrDebug
/**
* Show Pocket recommended stories on home.
*/

3
app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
View File

@ -30,7 +30,6 @@ import mozilla.components.concept.base.images.ImageLoader
import mozilla.components.concept.engine.mediasession.MediaSession
import mozilla.components.support.ktx.kotlin.MAX_URI_LENGTH
import mozilla.telemetry.glean.private.NoExtras
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.GleanMetrics.Tab
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
@ -244,7 +243,7 @@ abstract class AbstractBrowserTabViewHolder(
val touchStart = touchStartPoint
val selected = holder.selectedItems
val selectsOnlyThis = (selected.size == 1 && selected.contains(item))
if (FeatureFlags.tabReorderingFeature && selectsOnlyThis && touchStart != null) {
if (selectsOnlyThis && touchStart != null) {
// If the parent is null then return early and mark the event as unhandled
val parent = itemView.parent as? AbstractBrowserTrayList ?: return@setOnTouchListener false