Commit 3e8eedcc authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

fixup! [android] Disable features and functionality 

Bug 45103: Disable broken tab management
parent 24c85c18

mobile/android/fenix/app/nimbus.fml.yaml

+5 −5
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ features: 
          opening_animation_enabled: false

      - channel: nightly

        value:

          opening_animation_enabled: true

          opening_animation_enabled: false



  tab-groups:

    description: Control the visibility of the tab groups feature.
@@ -979,10 +979,10 @@ features: 
          enabled: false

      - channel: beta

        value:

          enabled: true

          enabled: false

      - channel: nightly

        value:

          enabled: true

          enabled: false

  tab-groups-drag-and-drop:

    description: Control the visibility of drag and drop for tab groups.

    variables:
@@ -997,10 +997,10 @@ features: 
          enabled: false

      - channel: beta

        value:

          enabled: true

          enabled: false

      - channel: nightly

        value:

          enabled: true

          enabled: false

  tab-groups-onboarding:

    description: Control the visibility of onboarding for tab groups.

    variables:

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabManagementFeatureHelper.kt

+5 −4
Original line number Diff line number Diff line
@@ -49,14 +49,15 @@ interface TabManagementFeatureHelper { 
 */

data object DefaultTabManagementFeatureHelper : TabManagementFeatureHelper {



    // Disable all tab group features since they only work in non-private tabs

    override val openingAnimationEnabled: Boolean

        get() = Config.channel.isDebug || FxNimbus.features.tabManagementEnhancements.value().openingAnimationEnabled

        get() = false



    override val tabGroupsEnabled: Boolean

        get() = Config.channel.isDebug || FxNimbus.features.tabGroups.value().enabled

        get() = false



    override val tabGroupsDragAndDropEnabled: Boolean

        get() = Config.channel.isDebug || FxNimbus.features.tabGroupsDragAndDrop.value().enabled

        get() = false



    override val tabGroupsLiveReorderEnabled: Boolean

        get() = FxNimbus.features.tabGroupsLiveReorder.value().enabled
@@ -65,7 +66,7 @@ data object DefaultTabManagementFeatureHelper : TabManagementFeatureHelper { 
        get() = false



    override val tabGroupsOnboardingEnabled: Boolean

        get() = Config.channel.isDebug || FxNimbus.features.tabGroupsOnboarding.value().enabled

        get() = false

}



val LocalTabManagementFeatureHelper = staticCompositionLocalOf<TabManagementFeatureHelper> {