March 2026 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] 8 commits: Bug 41725: Update toolchains for Firefox 148
by boklm (＠boklm) 03 Mar '26

03 Mar '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6e095bab by Nicolas Vigier at 2026-03-03T11:21:23+01:00 Bug 41725: Update toolchains for Firefox 148 - - - - - a29c899d by Nicolas Vigier at 2026-03-03T11:21:26+01:00 Bug 41725: Remove projects/oss-licenses-plugin https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… - - - - - f4700966 by Nicolas Vigier at 2026-03-03T11:21:28+01:00 Bug 41726: check that the sha512sum we have for the macOS SDK is the same as Mozilla - - - - - 9406ba99 by Nicolas Vigier at 2026-03-03T11:21:29+01:00 Bug 41728: Check that the sha256sum we have for nss is the same as Mozilla - - - - - eafc83b5 by Nicolas Vigier at 2026-03-03T11:21:30+01:00 Bug 41725: Bump firefox version to 148.0a1-2 - - - - - ba70ed85 by Nicolas Vigier at 2026-03-03T11:21:32+01:00 Bug 41737: Remove comment saying to update var/gradle_dependencies_version - - - - - 45b2ba09 by Nicolas Vigier at 2026-03-03T11:21:33+01:00 Bug 41736: Add generate_gradle_dependencies_list-$project makefile targets - - - - - 9921a71b by Nicolas Vigier at 2026-03-03T12:15:31+01:00 Bug 41745: Add .sh file extension to included build_* scripts in projects/geckoview Since those files are included and don't have a shebang, text editors which have syntax highlighting cannot easily detect the format. Adding the .sh file extension usually fixes that. - - - - - 28 changed files: - Makefile - doc/how-to-update-gradle-dependencies-list.md - projects/application-services/build - projects/application-services/config - projects/application-services/gradle-dependencies-list.txt - projects/application-services/list_toolchain_updates_checks - projects/common/gen-gradle-deps-file.py - projects/firefox/config - projects/firefox/list_toolchain_updates_checks - projects/geckoview/build - projects/geckoview/build_ac_fenix → projects/geckoview/build_ac_fenix.sh - projects/geckoview/build_apk - projects/geckoview/build_common → projects/geckoview/build_common.sh - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/geckoview/list_toolchain_updates_checks - projects/glean/build - projects/glean/config - projects/glean/gradle-dependencies-list.txt - projects/glean/use-uniffi-noop.diff - projects/gradle/config - projects/macosx-toolchain/config - − projects/oss-licenses-plugin/build - − projects/oss-licenses-plugin/build-customization.diff - − projects/oss-licenses-plugin/config - − projects/oss-licenses-plugin/gradle-dependencies-list.txt - − projects/oss-licenses-plugin/sort-dependencies-pr-268.patch - rbm.conf The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 69e76487 by Dan Ballard at 2026-03-03T09:21:29-08:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates TB 44703: Updating rebase alpha template with recent 148 experience - - - - - 1 changed file: - .gitlab/issue_templates/060 Rebase - Alpha.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -13,7 +13,7 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - Rebase application-services - uniffi-rs - Prepare the rebase - - [ ] Verify if application-services has updated it's uniffi-rs version + - [ ] Verify if application-services has updated it's uniffi-rs version else skip this step - [ ] Get the [upstream](https://github.com/mozilla/uniffi-rs) tag - [ ] Freeze the current default branch - [ ] Create the target branch (`X.XX.X`) @@ -45,10 +45,11 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - Prepare the rebase - [ ] Get the [Firefox](https://github.com/mozilla-firefox/firefox) tag - Do the rebase [Part 1] - - [ ] Create the target branch (`tor-browser-...-1`) - - [ ] Cherry-pick commits until `tor-browser-...-build1` + - [ ] Create the target branch (`tor-browser-XXX.0a1-YY.0-1`) + - [ ] Cherry-pick commits until `tor-browser-(XXX - 1).0a1-YY.0-2-build1` + - Optional: If your first rebase, complex, or difficult, can do an MR here for feedback. - [ ] Freeze the current default branch - - [ ] Cherry-pick remaining commits + - [ ] Cherry-pick remaining commits (rest of tor-browser-(XXX - 1)a1-YY.Y-2) - Merge - [ ] Perform a self-review (`git range-diff`) - [ ] Run linters @@ -62,10 +63,14 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - [ ] Make `tor-browser-...-1` the default branch and freeze it - Do the rebase [Part 2] - [ ] Create the target branch (`tor-browser-...-2`) - - [ ] Cherry-pick commits until `tor-browser-...-1-build1` + - [ ] Cherry-pick commits until `tor-browser-XXX...-1-build1` - [ ] Squash (`git rebase --autosquash FIREFOX_...`) - [ ] Cherry-pick the remaining commits - [ ] Reorder commits + - [ ] Move Mozilla "Bug ZZZZZZZZ" issues to the very start + - [ ] Move any Base Browser "BB TTTTT" issues into the BB range + - [ ] Move `--fixups` next to their parent (`git rebase -i --autosquash FIREFOX_...` then change all the `fixup` to `pick`) + - Note: also `drop` any commits marked `!dropme` - Merge - [ ] Perform a self-review (`git range-diff` + diff of diffs) - [ ] Run linters View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69e7648… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69e7648… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] 2 commits: fixup! TB 44098: [android] Disable sync
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 9a24e35c by clairehurst at 2026-03-03T09:19:42-08:00 fixup! TB 44098: [android] Disable sync - - - - - 1142203f by clairehurst at 2026-03-03T09:19:42-08:00 fixup! TB 34403 [android]: Disable Normal mode by default. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/banner/TabsTrayBanner.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/banner/TabsTrayBanner.kt ===================================== @@ -326,40 +326,6 @@ private fun TabPageBanner( style = FirefoxTheme.typography.button, ) } - - Tab( - selected = selectedPage == Page.NormalTabs, - onClick = { onTabPageIndicatorClicked(Page.NormalTabs) }, - modifier = Modifier - .testTag(TabsTrayTestTag.NORMAL_TABS_PAGE_BUTTON) - .semantics { - contentDescription = normalTabDescription - } - .height(RowHeight), - unselectedContentColor = inactiveColor, - ) { - Text( - text = stringResource(R.string.tabs_header_normal_tabs_title), - style = FirefoxTheme.typography.button, - ) - } - - Tab( - selected = selectedPage == Page.SyncedTabs, - onClick = { onTabPageIndicatorClicked(Page.SyncedTabs) }, - modifier = Modifier - .testTag(TabsTrayTestTag.SYNCED_TABS_PAGE_BUTTON) - .semantics { - contentDescription = syncedTabDescription - } - .height(RowHeight), - unselectedContentColor = inactiveColor, - ) { - Text( - text = stringResource(id = R.string.tabs_header_synced_tabs_title), - style = FirefoxTheme.typography.button, - ) - } } } }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec8f5c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec8f5c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! BB 44522: Modify the about dialog.
by henry (＠henry) 03 Mar '26

03 Mar '26

henry pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: ec8f5ce3 by Henry Wilkes at 2026-03-03T16:25:56+00:00 fixup! BB 44522: Modify the about dialog. TB 44713: Restore the top padding that was removed upstream. - - - - - 1 changed file: - browser/base/content/aboutDialog.css Changes: ===================================== browser/base/content/aboutDialog.css ===================================== @@ -192,6 +192,7 @@ } #rightBox { + padding-block-start: 38px; background-size: auto; margin-inline: 30px; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ec8f5ce… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ec8f5ce… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! TB 42669: [android] Use custom no-op app-services
by boklm (＠boklm) 03 Mar '26

03 Mar '26

boklm pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 3c502c6e by Nicolas Vigier at 2026-03-03T11:23:14+01:00 fixup! TB 42669: [android] Use custom no-op app-services TB 44690: remove nimbus handling code as it's changed in moz - - - - - 2 changed files: - mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy - mobile/android/moz.configure Changes: ===================================== mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy ===================================== @@ -23,6 +23,12 @@ import org.gradle.api.tasks.Nested import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction +import java.io.File +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import java.nio.file.StandardCopyOption + import javax.inject.Inject import java.security.MessageDigest @@ -148,6 +154,17 @@ abstract class NimbusAssembleToolsTask extends DefaultTask { @TaskAction void assembleTools() { + String nimbusFml = System.getenv("NIMBUS_FML") + if (nimbusFml == null || "".equals(nimbusFml)) { + nimbusFml = System.getProperty("nimbusFml") + } + if (nimbusFml != null && !"".equals(nimbusFml)) { + Path source = (new File(nimbusFml)).toPath() + Path dest = fmlBinary.get().asFile.toPath() + Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING) + return + } + def binaryFile = fmlBinary.get().asFile def archiveFileObj = archiveFile.get().asFile def hashFileObj = hashFile.get().asFile ===================================== mobile/android/moz.configure ===================================== @@ -233,8 +233,8 @@ def check_host_bin_prog(var, prog, toolchain=None): ) -check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") # tb-44669 - this was added in rebase 148 to make android compile but tracking potentially better fix +#check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") #check_host_bin_prog("NIMBUS_FML", "nimbus-fml") project_flag( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41744: Reduce duplication between projects/geckoview/build and projects/geckoview/build_apk
by boklm (＠boklm) 03 Mar '26

03 Mar '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 84af6965 by Nicolas Vigier at 2026-03-02T18:27:45+01:00 Bug 41744: Reduce duplication between projects/geckoview/build and projects/geckoview/build_apk - - - - - 3 changed files: - projects/geckoview/build - projects/geckoview/build_apk - projects/geckoview/build_common Changes: ===================================== projects/geckoview/build ===================================== @@ -1,26 +1,20 @@ #!/bin/bash -[% INCLUDE 'build_common' %] +[% c("var/set_default_env") -%] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/cbindgen') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nasm') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang-linux/bin/llvm-config" export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang-linux/bin:$PATH" [% IF c("var/rlbox") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/wasi-sysroot') %] export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/ [% END -%] -cd /var/tmp/build/[% project %]-[% c("version") %] -cp $rootdir/mozconfig ./ - -echo "Starting ./mach configure $(date)" -./mach configure \ - [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ - [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \ - [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] +[% INCLUDE 'build_common' %] echo "Starting ./mach build $(date)" ./mach build --verbose [% IF c('var/generate_gradle_dependencies_list') %]2>&1 | tee -a $gradle_logs[% END %] ===================================== projects/geckoview/build_apk ===================================== @@ -1,10 +1,15 @@ #!/bin/bash -[% INCLUDE 'build_common' %] +[% c("var/set_default_env") -%] -echo "Starting the creation of the fat AAR $(date)" +# Specify the architectures we want to merge +export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64 +export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/target.maven.zip +export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/target.maven.zip +export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/target.maven.zip -tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +[% INCLUDE 'build_common' %] +./mach build --verbose [% IF c("var/dev_artifacts") -%] mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a @@ -15,22 +20,4 @@ tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') % mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64 [% END -%] -# Specify the architectures we want to merge -export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64 -export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/target.maven.zip -export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/target.maven.zip -export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/target.maven.zip - -cd $builddir/[% project %]-[% c("version") %] -cp $rootdir/mozconfig ./ - -# We still need to specify --base-browser-version due to bug 34005. -./mach configure \ - --with-base-browser-version=[% c("var/torbrowser_version") %] \ - --enable-update-channel=[% c("var/variant") %] \ - --with-branding=$branding_dir \ - [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] - -./mach build --verbose - [% INCLUDE 'build_ac_fenix' %] ===================================== projects/geckoview/build_common ===================================== @@ -1,4 +1,3 @@ -[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), }) %] @@ -82,3 +81,13 @@ touch $HOME/.mozbuild/android-device/avd chmod +x $HOME/.mozbuild/android-device/avd [% INCLUDE 'browser-localization' %] + +cd $builddir/[% project %]-[% c("version") %] +cp $rootdir/mozconfig ./ + +echo "Starting ./mach configure $(date)" +# We still need to specify --base-browser-version due to bug 34005. +./mach configure \ + [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ + [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \ + [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-148.0a1-16.0-1
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed new branch mullvad-browser-148.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-148.0a1-16.0-2-build1
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed new tag base-browser-148.0a1-16.0-2-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] TB 44581 [android]: Cleanup new android compose tab-strip feature
by clairehurst (＠clairehurst) 02 Mar '26

02 Mar '26

clairehurst pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: ac3ffc44 by clairehurst at 2026-03-02T16:22:13-07:00 TB 44581 [android]: Cleanup new android compose tab-strip feature - - - - - 5 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/CustomTabMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MenuNavigation.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MoreSettingsSubmenu.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt ===================================== @@ -118,6 +118,7 @@ import com.google.android.material.R as materialR import mozilla.components.browser.engine.gecko.GeckoEngineSession import android.util.Log +import org.mozilla.fenix.HomeActivity // EXPANDED_MIN_RATIO is used for BottomSheetBehavior.halfExpandedRatio(). // That value needs to be less than the PEEK_HEIGHT. @@ -321,7 +322,7 @@ class MenuDialogFragment : BottomSheetDialogFragment() { activity?.let { activity -> activity.lifecycleScope.launch { deleteBrowsingDataController.clearBrowsingDataOnQuit { - activity.finishAndRemoveTask() + (activity as HomeActivity).shutDown() } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/CustomTabMenu.kt ===================================== @@ -222,20 +222,6 @@ internal fun CustomTabMenu( badgeBackgroundColor = badgeBackgroundColor, ) } - - if (shouldShowExtensionsMenu) { - ExtensionsMenuItem( - inCustomTab = true, - isPrivate = isPrivate, - isExtensionsProcessDisabled = isExtensionsProcessDisabled, - isExtensionsExpanded = isExtensionsExpanded, - isAllWebExtensionsDisabled = isAllWebExtensionsDisabled, - webExtensionMenuCount = webExtensionMenuCount, - extensionsMenuItemDescription = extensionsMenuDescription, - onExtensionsMenuClick = onExtensionsMenuClick, - extensionSubmenu = extensionSubmenu, - ) - } } if (!customTabMenuItems.isNullOrEmpty()) { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt ===================================== @@ -243,33 +243,6 @@ fun MainMenu( } } - if (accessPoint == MenuAccessPoint.Home && showBanner) { - MenuBanner( - onDismiss = { - onBannerDismiss() - }, - onClick = { - onBannerClick() - }, - ) - } - - if (accessPoint == MenuAccessPoint.Home) { - MenuGroup { - ExtensionsMenuItem( - inCustomTab = false, - isPrivate = isPrivate, - isExtensionsProcessDisabled = isExtensionsProcessDisabled, - isExtensionsExpanded = isExtensionsExpanded, - isAllWebExtensionsDisabled = isAllWebExtensionsDisabled, - webExtensionMenuCount = webExtensionMenuCount, - extensionsMenuItemDescription = extensionsMenuItemDescription, - onExtensionsMenuClick = onExtensionsMenuClick, - extensionSubmenu = extensionSubmenu, - ) - } - } - if (accessPoint == MenuAccessPoint.Browser) { ToolsAndActionsMenuGroup( isBookmarked = isBookmarked, @@ -304,45 +277,24 @@ fun MainMenu( ) MenuGroup { - MozillaAccountMenuItem( - account = account, - accountState = accountState, - isPrivate = isPrivate, - onClick = onMozillaAccountButtonClick, - ) - MenuItem( label = stringResource(id = R.string.browser_menu_settings), beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_settings_24), onClick = onSettingsButtonClick, ) - } - - if (showQuitMenu) { - QuitMenuGroup( - onQuitMenuClick = onQuitMenuClick, + MenuItem( + label = stringResource( + id = R.string.browser_menu_delete_browsing_data_on_quit, + stringResource(id = R.string.app_name), + ), + beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_cross_circle_24), + state = MenuItemState.WARNING, + onClick = onQuitMenuClick, ) } } } -@Composable -private fun QuitMenuGroup( - onQuitMenuClick: () -> Unit, -) { - MenuGroup { - MenuItem( - label = stringResource( - id = R.string.browser_menu_delete_browsing_data_on_quit, - stringResource(id = R.string.app_name), - ), - beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_cross_circle_fill_24), - state = MenuItemState.WARNING, - onClick = onQuitMenuClick, - ) - } -} - @Suppress("LongParameterList", "LongMethod", "CognitiveComplexMethod") @Composable private fun ToolsAndActionsMenuGroup( @@ -435,21 +387,9 @@ private fun ToolsAndActionsMenuGroup( ) } - ExtensionsMenuItem( - inCustomTab = false, - isPrivate = isPrivate, - isExtensionsProcessDisabled = isExtensionsProcessDisabled, - isExtensionsExpanded = isExtensionsExpanded, - isAllWebExtensionsDisabled = isAllWebExtensionsDisabled, - webExtensionMenuCount = webExtensionMenuCount, - extensionsMenuItemDescription = extensionsMenuItemDescription, - onExtensionsMenuClick = onExtensionsMenuClick, - extensionSubmenu = extensionSubmenu, - ) - if (!moreMenuExpanded) { MoreMenuButtonGroup( - isMoreMenuHighlighted = isMoreMenuHighlighted, + isMoreMenuHighlighted = false, // This prevents a dot from incorrectly showing e.g. "open in app" is available, even though we disable it. onMoreMenuClick = onMoreMenuClick, ) } @@ -530,33 +470,20 @@ private fun LibraryMenuGroup( .semantics { this.collectionInfo = CollectionInfo( rowCount = 1, - columnCount = 4, + columnCount = 2, ) }, horizontalArrangement = Arrangement.SpaceEvenly, verticalAlignment = Alignment.CenterVertically, ) { - LibraryMenuItem( - modifier = Modifier - .weight(1f) - .fillMaxHeight(), - iconRes = iconsR.drawable.mozac_ic_history_24, - labelRes = R.string.library_history, - shape = leftShape, - index = 0, - onClick = onHistoryMenuClick, - ) - - Spacer(Modifier.width(spacerWidth)) - LibraryMenuItem( modifier = Modifier .weight(1f) .fillMaxHeight(), iconRes = iconsR.drawable.mozac_ic_bookmark_tray_fill_24, labelRes = R.string.library_bookmarks, - shape = middleShape, - index = 1, + shape = leftShape, + index = 0, onClick = onBookmarksMenuClick, ) @@ -569,22 +496,9 @@ private fun LibraryMenuGroup( isHighlighted = isDownloadHighlighted, iconRes = iconsR.drawable.mozac_ic_download_24, labelRes = R.string.library_downloads, - shape = middleShape, - index = 2, - onClick = onDownloadsMenuClick, - ) - - Spacer(Modifier.width(spacerWidth)) - - LibraryMenuItem( - modifier = Modifier - .weight(1f) - .fillMaxHeight(), - iconRes = iconsR.drawable.mozac_ic_login_24, - labelRes = R.string.browser_menu_passwords, shape = rightShape, - index = 3, - onClick = onPasswordsMenuClick, + index = 1, + onClick = onDownloadsMenuClick, ) } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MenuNavigation.kt ===================================== @@ -95,14 +95,6 @@ internal fun MenuNavigation( onLongClick = { onForwardButtonClick(true) }, ) - MenuNavItem( - modifier = Modifier.weight(1f), - state = state, - painter = painterResource(id = iconsR.drawable.mozac_ic_share_android_24), - label = stringResource(id = R.string.browser_menu_share), - onClick = onShareButtonClick, - ) - if (isSiteLoading) { MenuNavItem( modifier = Modifier.weight(1f), ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MoreSettingsSubmenu.kt ===================================== @@ -49,67 +49,6 @@ internal fun MoreSettingsSubmenu( Column( verticalArrangement = Arrangement.spacedBy(2.dp), ) { - if (translationInfo.isTranslationSupported) { - TranslationMenuItem( - translationInfo = translationInfo, - isReaderViewActive = isReaderViewActive, - ) - } - - if (isWebCompatReporterSupported) { - MenuItem( - label = stringResource(id = R.string.browser_menu_webcompat_reporter_2), - beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_lightbulb_24), - state = if (isWebCompatEnabled) MenuItemState.ENABLED else MenuItemState.DISABLED, - onClick = onWebCompatReporterClick, - ) - } - - if (showShortcuts) { - ShortcutsMenuItem( - isPinned = isPinned, - onShortcutsMenuClick = onShortcutsMenuClick, - ) - } - - if (isAddToHomeScreenSupported) { - MenuItem( - label = if (isInstallable) { - stringResource(id = R.string.browser_menu_add_app_to_homescreen) - } else { - stringResource(id = R.string.browser_menu_add_to_homescreen) - }, - beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_add_to_homescreen_24), - onClick = onAddToHomeScreenMenuClick, - ) - } - - MenuItem( - label = stringResource(id = R.string.browser_menu_save_to_collection_2), - beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_collection_24), - onClick = onSaveToCollectionMenuClick, - ) - - if (hasExternalApp) { - MenuItem( - label = if (externalAppName != "") { - stringResource(id = R.string.browser_menu_open_in_fenix, externalAppName) - } else { - stringResource(id = R.string.browser_menu_open_app_link) - }, - beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_more_grid_24), - isBeforeIconHighlighted = isOpenInAppMenuHighlighted, - state = MenuItemState.ENABLED, - onClick = onOpenInAppMenuClick, - ) - } else { - MenuItem( - label = stringResource(id = R.string.browser_menu_open_app_link), - beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_more_grid_24), - state = MenuItemState.DISABLED, - ) - } - MenuItem( label = stringResource(id = R.string.browser_menu_save_as_pdf_2), beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_save_file_24), View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ac3ffc4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ac3ffc4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] TB 44582 [android]: Temporarily disable settings search button on Android
by clairehurst (＠clairehurst) 02 Mar '26

02 Mar '26

clairehurst pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 63d57d3e by clairehurst at 2026-03-02T15:07:09-08:00 TB 44582 [android]: Temporarily disable settings search button on Android - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -2024,7 +2024,7 @@ class Settings( var isSettingsSearchEnabled by booleanPreference( key = appContext.getPreferenceKey(R.string.pref_key_allow_settings_search), - default = { FxNimbus.features.settingsSearch.value().enabled }, + default = false, ) var isTabStripEnabled by booleanPreference( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/63d57d3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/63d57d3… You're receiving this email because of your account on gitlab.torproject.org.

1 0