Dan Ballard pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 4bd15158 by clairehurst at 2026-08-18T17:06:28-06:00 fixup! [android] Disable features and functionality - - - - - 3 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt - mobile/android/fenix/app/src/main/res/layout/preference_search_engine_chooser.xml - mobile/android/fenix/app/src/main/res/xml/default_search_engine_preferences.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt ===================================== @@ -43,8 +43,8 @@ class RadioSearchEngineListPreference @JvmOverloads constructor( private val itemResId: Int get() = R.layout.search_engine_radio_button - private val isForPrivateBrowsing: Boolean - get() = key == context.getString(R.string.pref_key_private_search_engine_list) + // tb-45227: set this to false in order to disable special pbm handling + private val isForPrivateBrowsing: Boolean = false init { layoutResource = R.layout.preference_search_engine_chooser ===================================== mobile/android/fenix/app/src/main/res/layout/preference_search_engine_chooser.xml ===================================== @@ -9,7 +9,7 @@ android:orientation="vertical"> <RadioGroup android:id="@+id/search_engine_group" - android:paddingTop="8dp" + android:paddingTop="0dp" android:layout_width="match_parent" android:layout_height="wrap_content" /> ===================================== mobile/android/fenix/app/src/main/res/xml/default_search_engine_preferences.xml ===================================== @@ -5,27 +5,15 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceCategory - android:title="@string/preferences_category_select_default_search_engine_2" android:selectable="false" - app:iconSpaceReserved="false" - android:layout="@layout/preference_category_no_icon_style"> - <org.mozilla.fenix.settings.search.RadioSearchEngineListPreference - android:key="@string/pref_key_search_engine_list" - android:selectable="false"/> - </PreferenceCategory> - <PreferenceCategory - android:title="@string/preferences_category_select_private_search_engine" - android:selectable="false" - app:iconSpaceReserved="false" - android:layout="@layout/preference_category_no_icon_style"> + app:iconSpaceReserved="false"> <org.mozilla.fenix.settings.search.RadioSearchEngineListPreference android:key="@string/pref_key_private_search_engine_list" android:selectable="false"/> </PreferenceCategory> <PreferenceCategory android:selectable="false" - app:iconSpaceReserved="false" - android:layout="@layout/preference_category_no_icon_style"> + app:iconSpaceReserved="false"> <Preference android:key="@string/pref_key_add_search_engine" android:title="@string/search_engine_add_custom_search_engine_title" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4bd15158... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4bd15158... 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