[Git][tpo/applications/tor-browser][tor-browser-153.3.0esr-16.0-1] 2 commits: fixup! [android] Delete unused media

15 Sep 2026


      clairehurst pushed to branch tor-browser-153.3.0esr-16.0-1 at The Tor Project / Applications / Tor Browser


Commits:
f10073b8 by clairehurst at 2026-09-14T14:51:55-06:00
fixup! [android] Delete unused media

Bug 45281: Fix or remove broken "Use screen lock to hide Tor Browser tabs" feature

- - - - -
1b4a47f7 by clairehurst at 2026-09-14T14:51:55-06:00
fixup! TB 44027: [android] Update PBM lockscreen

Bug 45281: Fix or remove broken "Use screen lock to hide Tor Browser tabs" feature

- - - - -


24 changed files:

- mobile/android/fenix/app/nimbus.fml.yaml
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsScreen.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt
- + mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp
- + mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp
- + mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml
- + mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp
- mobile/android/fenix/app/src/main/res/values/styles.xml
- + mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp
- + mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp
- + mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp
- + mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp
- + mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp
- + mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp
- + mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp


Changes:

=====================================
mobile/android/fenix/app/nimbus.fml.yaml
=====================================
@@ -913,7 +913,7 @@ features:
         description: >
           Whether or not to enable private browsing mode lock.
         type: Boolean
-        default: false
+        default: true
 
   app-links:
     description: Control behavior of app links handling in the browser.


=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsScreen.kt
=====================================
@@ -96,14 +96,14 @@ private fun Logo() {
     ) {
         Image(
             modifier = Modifier.padding(end = 14.dp),
-            painter = painterResource(getResolvedAttrResId(R.attr.fenixWordmarkLogo)),
+            painter = painterResource(R.drawable.tor_browser_app_icon),
             contentDescription = null,
         )
 
-        Image(
-            modifier = Modifier.height(28.dp),
-            painter = painterResource(getResolvedAttrResId(R.attr.fenixWordmarkText)),
-            contentDescription = stringResource(R.string.app_name),
+        Text(
+            text = stringResource(R.string.app_name),
+            style = FirefoxTheme.typography.headline5,
+            maxLines = 1,
         )
     }
 }
@@ -130,7 +130,7 @@ private fun Footer(onUnlockClicked: () -> Unit, onLeaveClicked: () -> Unit, show
 
         Spacer(modifier = Modifier.height(8.dp))
 
-        if (showNegativeButton) {
+        if (false) {
             TextButton(
                 text = stringResource(R.string.pbm_authentication_leave_private_tabs),
                 onClick = onLeaveClicked,


=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt
=====================================
@@ -65,8 +65,8 @@ class TabsSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm
     private lateinit var startForResult: ActivityResultLauncher<Intent>
 
     private fun onSuccessfulAuthenticationUsingFallbackPrompt() {
-        val newValue = !requireContext().components.settings.privateBrowsingLockedFeatureEnabled
-        requireContext().components.settings.privateBrowsingLockedFeatureEnabled = newValue
+        val newValue = !requireContext().components.settings.privateBrowsingModeLocked
+        requireContext().components.settings.privateBrowsingModeLocked = newValue
         // Update switch state manually
         requirePreference<SwitchPreferenceCompat>(R.string.pref_key_private_browsing_locked_enabled).apply {
             isChecked = !isChecked
@@ -77,7 +77,7 @@ class TabsSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm
         pbmLockEnabled: Boolean,
         preference: Preference,
     ) {
-        requireContext().components.settings.privateBrowsingLockedFeatureEnabled = pbmLockEnabled
+        requireContext().components.settings.privateBrowsingModeLocked = pbmLockEnabled
         // Update switch state manually
         (preference as? SwitchPreferenceCompat)?.isChecked = pbmLockEnabled
     }
@@ -151,7 +151,7 @@ class TabsSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm
         requirePreference<SwitchPreferenceCompat>(R.string.pref_key_private_browsing_locked_enabled).apply {
             title = getString(R.string.preferences_tor_lock_screen_title, getString(R.string.app_name))
             summary = getString(R.string.preferences_tor_lock_screen_summary, getString(R.string.app_name))
-            isChecked = context.components.settings.privateBrowsingLockedFeatureEnabled &&
+            isChecked = context.components.settings.privateBrowsingModeLocked &&
                     biometricManager.isAuthenticatorAvailable()
             isVisible = deviceCapable
             isEnabled = userHasEnabledCapability


=====================================
mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml
=====================================
@@ -0,0 +1,11 @@
+<!-- trivialise assets tb#44448 -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="16dp"
+  android:height="16dp"
+  android:viewportWidth="16"
+  android:viewportHeight="16">
+
+  <path
+    android:fillColor="#FF0000"
+    android:pathData="M0 0, L0 16, L16 16, L16 0, Z" />
+</vector>


=====================================
mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp differ


=====================================
mobile/android/fenix/app/src/main/res/values/styles.xml
=====================================
@@ -155,10 +155,9 @@
         <item name="mozac_widget_favicon_border_color">@color/fx_mobile_outline_variant</item>
 
         <!-- Drawables -->
-<!--        Removed as part of tor-browser#42386-->
-<!--        <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>-->
-<!--        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_normal</item>-->
-<!--        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>-->
+        <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
+        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_normal</item>
+        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>
         <item name="fenixWordmarkSportLogo">@drawable/ic_wordmark_sport_logo</item>
         <item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
         <item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
@@ -434,10 +433,9 @@
         <item name="mozac_widget_favicon_border_color">@color/photonInk50</item>
 
         <!-- Drawables -->
-<!--        Removed as part of tor-browser#42386-->
-<!--        <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>-->
-<!--        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_private</item>-->
-<!--        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>-->
+        <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
+        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_private</item>
+        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>
         <item name="fenixWordmarkSportLogo">@drawable/ic_wordmark_sport_logo</item>
         <item name="torBootstrapBackground">@drawable/tor_bootstrap_background_gradient</item>
         <item name="bottomBarBackground">@drawable/private_home_bottom_bar_background_gradient</item>


=====================================
mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp differ


=====================================
mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp differ


=====================================
mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp differ


=====================================
mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp
=====================================
Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp differ



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/07c94c2...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/07c94c2...
You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

    

clairehurst (＠clairehurst)

tags

participants (1)