fixup! [android] Modify UI/UX

Bug 43052: Hide normal and synced tabs in the tabs tray

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

@@ -50,6 +50,7 @@ import org.mozilla.fenix.compose.Divider
 import org.mozilla.fenix.compose.MenuItem
 import org.mozilla.fenix.compose.TabCounter
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.tabstray.ext.getMenuItems
 import org.mozilla.fenix.theme.FirefoxTheme
 import kotlin.math.max
@@ -192,6 +193,7 @@ private fun TabPageBanner(
     onTabPageIndicatorClicked: (Page) -> Unit,
     onDismissClick: () -> Unit,
 ) {
+    val shouldDisableNormalMode = LocalContext.current.settings().shouldDisableNormalMode
     val selectedColor = FirefoxTheme.colors.iconActive
     val inactiveColor = FirefoxTheme.colors.iconPrimaryInactive
     var showMenu by remember { mutableStateOf(false) }
@@ -216,12 +218,13 @@ private fun TabPageBanner(
         ) {
             CompositionLocalProvider(LocalRippleTheme provides DisabledRippleTheme) {
                 TabRow(
-                    selectedTabIndex = selectedPage.ordinal,
+                    selectedTabIndex = if (shouldDisableNormalMode) 0 else selectedPage.ordinal,
                     modifier = Modifier.fillMaxWidth(MAX_WIDTH_TAB_ROW_PERCENT),
                     backgroundColor = Color.Transparent,
                     contentColor = selectedColor,
                     divider = {},
                 ) {
+                    if (!shouldDisableNormalMode) {
                         Tab(
                             selected = selectedPage == Page.NormalTabs,
                             onClick = { onTabPageIndicatorClicked(Page.NormalTabs) },
@@ -233,6 +236,7 @@ private fun TabPageBanner(
                         ) {
                             TabCounter(tabCount = normalTabCount)
                         }
+                    }
 
                     Tab(
                         selected = selectedPage == Page.PrivateTabs,
@@ -250,6 +254,7 @@ private fun TabPageBanner(
                         unselectedContentColor = inactiveColor,
                     )
 
+/*
                     Tab(
                         selected = selectedPage == Page.SyncedTabs,
                         onClick = { onTabPageIndicatorClicked(Page.SyncedTabs) },
@@ -265,6 +270,7 @@ private fun TabPageBanner(
                         selectedContentColor = selectedColor,
                         unselectedContentColor = inactiveColor,
                     )
+*/
                 }
             }