[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

Title: GitLab

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:

Changes:

  • mobile/android/fenix/app/nimbus.fml.yaml
    ... ... @@ -913,7 +913,7 @@ features:
    913 913 
             description: >
    914 914 
               Whether or not to enable private browsing mode lock.
    915 915 
             type: Boolean
    916 
    -        default: false
    916 
    +        default: true
    917 917
    918 918 
       app-links:
    919 919 
         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() {
    96 96 
         ) {
    97 97 
             Image(
    98 98 
                 modifier = Modifier.padding(end = 14.dp),
    99 
    -            painter = painterResource(getResolvedAttrResId(R.attr.fenixWordmarkLogo)),
    99 
    +            painter = painterResource(R.drawable.tor_browser_app_icon),
    100 100 
                 contentDescription = null,
    101 101 
             )
    102 102
    103 
    -        Image(
    104 
    -            modifier = Modifier.height(28.dp),
    105 
    -            painter = painterResource(getResolvedAttrResId(R.attr.fenixWordmarkText)),
    106 
    -            contentDescription = stringResource(R.string.app_name),
    103 
    +        Text(
    104 
    +            text = stringResource(R.string.app_name),
    105 
    +            style = FirefoxTheme.typography.headline5,
    106 
    +            maxLines = 1,
    107 107 
             )
    108 108 
         }
    109 109 
     }
    ... ... @@ -130,7 +130,7 @@ private fun Footer(onUnlockClicked: () -> Unit, onLeaveClicked: () -> Unit, show
    130 130
    131 131 
             Spacer(modifier = Modifier.height(8.dp))
    132 132
    133 
    -        if (showNegativeButton) {
    133 
    +        if (false) {
    134 134 
                 TextButton(
    135 135 
                     text = stringResource(R.string.pbm_authentication_leave_private_tabs),
    136 136 
                     onClick = onLeaveClicked,

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

  • mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml
    1 
    +<!-- trivialise assets tb#44448 -->
    2 
    +<vector xmlns:android="http://schemas.android.com/apk/res/android"
    3 
    +  android:width="16dp"
    4 
    +  android:height="16dp"
    5 
    +  android:viewportWidth="16"
    6 
    +  android:viewportHeight="16">
    7 
    +
    8 
    +  <path
    9 
    +    android:fillColor="#FF0000"
    10 
    +    android:pathData="M0 0, L0 16, L16 16, L16 0, Z" />
    11 
    +</vector>

  • mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp
    No preview for this file type
  • mobile/android/fenix/app/src/main/res/values/styles.xml
    ... ... @@ -155,10 +155,9 @@
    155 155 
             <item name="mozac_widget_favicon_border_color">@color/fx_mobile_outline_variant</item>
    156 156
    157 157 
             <!-- Drawables -->
    158 
    -<!--        Removed as part of tor-browser#42386-->
    159 
    -<!--        <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>-->
    160 
    -<!--        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_normal</item>-->
    161 
    -<!--        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>-->
    158 
    +        <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
    159 
    +        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_normal</item>
    160 
    +        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>
    162 161 
             <item name="fenixWordmarkSportLogo">@drawable/ic_wordmark_sport_logo</item>
    163 162 
             <item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
    164 163 
             <item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
    ... ... @@ -434,10 +433,9 @@
    434 433 
             <item name="mozac_widget_favicon_border_color">@color/photonInk50</item>
    435 434
    436 435 
             <!-- Drawables -->
    437 
    -<!--        Removed as part of tor-browser#42386-->
    438 
    -<!--        <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>-->
    439 
    -<!--        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_private</item>-->
    440 
    -<!--        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>-->
    436 
    +        <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
    437 
    +        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_private</item>
    438 
    +        <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>
    441 439 
             <item name="fenixWordmarkSportLogo">@drawable/ic_wordmark_sport_logo</item>
    442 440 
             <item name="torBootstrapBackground">@drawable/tor_bootstrap_background_gradient</item>
    443 441 
             <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
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp
    No preview for this file type
  • mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp
    No preview for this file type
  • mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp
    No preview for this file type

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/07c94c27223f849b4197388d3c8485d02c6b24a3...1b4a47f7d2d9f69a013d2eeb7df372e8ea99af34 at 1789494921 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx