clairehurst pushed to branch tor-browser-150.0a1-16.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
aadab032
by clairehurst at 2026-04-23T12:22:15-06:00
-
20e7add2
by clairehurst at 2026-04-23T12:22:16-06:00
-
f06156f6
by clairehurst at 2026-04-23T12:22:16-06:00
-
64fff63a
by clairehurst at 2026-04-23T12:22:17-06:00
5 changed files:
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt
Changes:
| ... | ... | @@ -445,6 +445,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { |
| 445 | 445 | }
|
| 446 | 446 | |
| 447 | 447 | // tor-browser#43730: Do not delay splash screen
|
| 448 | + // Fix edgeToEdge display issue presented in 150 android rebase. Taken from deleted splash screen code
|
|
| 449 | + // https://gitlab.torproject.org/tpo/applications/tor-browser/-/work_items/44880
|
|
| 450 | + EdgeToEdgeFragmentLifecycleCallbacks.register(supportFragmentManager, window)
|
|
| 448 | 451 | // to fetch or apply Nimbus experiments.
|
| 449 | 452 | |
| 450 | 453 | lifecycleScope.launch {
|
| ... | ... | @@ -11,6 +11,7 @@ import androidx.preference.PreferenceFragmentCompat |
| 11 | 11 | import androidx.preference.SwitchPreferenceCompat
|
| 12 | 12 | import org.mozilla.fenix.Config
|
| 13 | 13 | import org.mozilla.fenix.R
|
| 14 | +import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment
|
|
| 14 | 15 | import org.mozilla.fenix.ext.components
|
| 15 | 16 | import org.mozilla.fenix.ext.settings
|
| 16 | 17 | import org.mozilla.fenix.ext.showToolbar
|
| ... | ... | @@ -24,7 +25,7 @@ import org.mozilla.fenix.utils.view.uncheckAll |
| 24 | 25 | * preference for configuring a user-provided bridge.
|
| 25 | 26 | */
|
| 26 | 27 | @Suppress("SpreadOperator")
|
| 27 | -class TorBridgeConfigFragment : PreferenceFragmentCompat() {
|
|
| 28 | +class TorBridgeConfigFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment {
|
|
| 28 | 29 | private val builtinBridgeRadioGroups = mutableListOf<GroupableRadioButton>()
|
| 29 | 30 | private var previousTransportConfig: TorBridgeTransportConfig? = null
|
| 30 | 31 |
| ... | ... | @@ -34,9 +34,10 @@ import mozilla.components.ui.colors.R as colorsR |
| 34 | 34 | import org.mozilla.fenix.HomeActivity
|
| 35 | 35 | import org.mozilla.fenix.R
|
| 36 | 36 | import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding
|
| 37 | +import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment
|
|
| 37 | 38 | import org.mozilla.fenix.ext.hideToolbar
|
| 38 | 39 | |
| 39 | -class TorConnectionAssistFragment : Fragment(), UserInteractionHandler {
|
|
| 40 | +class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemInsetsPaddedFragment {
|
|
| 40 | 41 | |
| 41 | 42 | private val TAG = "TorConnectionAssistFrag"
|
| 42 | 43 | private val progressViewModel: TorBootstrapProgressViewModel by viewModels()
|
| ... | ... | @@ -40,8 +40,9 @@ import androidx.lifecycle.compose.LocalLifecycleOwner |
| 40 | 40 | import mozilla.components.ui.colors.PhotonColors
|
| 41 | 41 | import mozilla.components.ui.icons.R as iconsR
|
| 42 | 42 | import org.mozilla.fenix.R
|
| 43 | +import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment
|
|
| 43 | 44 | |
| 44 | -class TorLogsComposeFragment : Fragment() {
|
|
| 45 | +class TorLogsComposeFragment : Fragment(), SystemInsetsPaddedFragment {
|
|
| 45 | 46 | private val viewModel: TorLogsViewModel by viewModels()
|
| 46 | 47 | |
| 47 | 48 | override fun onCreateView(
|
| ... | ... | @@ -19,8 +19,9 @@ import org.mozilla.fenix.R |
| 19 | 19 | import org.mozilla.fenix.ext.components
|
| 20 | 20 | import org.mozilla.fenix.databinding.FragmentTorSecurityLevelPreferencesBinding
|
| 21 | 21 | import androidx.core.content.edit
|
| 22 | +import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment
|
|
| 22 | 23 | |
| 23 | -class TorSecurityLevelFragment : Fragment() {
|
|
| 24 | +class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment {
|
|
| 24 | 25 | private var _binding: FragmentTorSecurityLevelPreferencesBinding? = null
|
| 25 | 26 | private val binding get() = _binding!!
|
| 26 | 27 |