Commit 8d1eaf55 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

fixup! TB 40041 [android]: Implement Tor Network Settings 

bug_44880: Fix edgeToEdge display issue presented in 150 android rebase
parent 38325b5c

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import androidx.preference.PreferenceFragmentCompat 
import androidx.preference.SwitchPreferenceCompat

import org.mozilla.fenix.Config

import org.mozilla.fenix.R

import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment

import org.mozilla.fenix.ext.components

import org.mozilla.fenix.ext.settings

import org.mozilla.fenix.ext.showToolbar
@@ -24,7 +25,7 @@ import org.mozilla.fenix.utils.view.uncheckAll 
 * preference for configuring a user-provided bridge.

 */

@Suppress("SpreadOperator")

class TorBridgeConfigFragment : PreferenceFragmentCompat() {

class TorBridgeConfigFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment {

    private val builtinBridgeRadioGroups = mutableListOf<GroupableRadioButton>()

    private var previousTransportConfig: TorBridgeTransportConfig? = null

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ import androidx.lifecycle.compose.LocalLifecycleOwner 
import mozilla.components.ui.colors.PhotonColors

import mozilla.components.ui.icons.R as iconsR

import org.mozilla.fenix.R

import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment



class TorLogsComposeFragment : Fragment() {

class TorLogsComposeFragment : Fragment(), SystemInsetsPaddedFragment {

    private val viewModel: TorLogsViewModel by viewModels()



    override fun onCreateView(