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
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:
| ... | ... | @@ -43,8 +43,8 @@ class RadioSearchEngineListPreference @JvmOverloads constructor( |
| 43 | 43 | private val itemResId: Int
|
| 44 | 44 | get() = R.layout.search_engine_radio_button
|
| 45 | 45 | |
| 46 | - private val isForPrivateBrowsing: Boolean
|
|
| 47 | - get() = key == context.getString(R.string.pref_key_private_search_engine_list)
|
|
| 46 | + // tb-45227: set this to false in order to disable special pbm handling
|
|
| 47 | + private val isForPrivateBrowsing: Boolean = false
|
|
| 48 | 48 | |
| 49 | 49 | init {
|
| 50 | 50 | layoutResource = R.layout.preference_search_engine_chooser
|
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | android:orientation="vertical">
|
| 10 | 10 | |
| 11 | 11 | <RadioGroup android:id="@+id/search_engine_group"
|
| 12 | - android:paddingTop="8dp"
|
|
| 12 | + android:paddingTop="0dp"
|
|
| 13 | 13 | android:layout_width="match_parent"
|
| 14 | 14 | android:layout_height="wrap_content" />
|
| 15 | 15 |
| ... | ... | @@ -5,27 +5,15 @@ |
| 5 | 5 | <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
| 6 | 6 | xmlns:app="http://schemas.android.com/apk/res-auto">
|
| 7 | 7 | <PreferenceCategory
|
| 8 | - android:title="@string/preferences_category_select_default_search_engine_2"
|
|
| 9 | 8 | android:selectable="false"
|
| 10 | - app:iconSpaceReserved="false"
|
|
| 11 | - android:layout="@layout/preference_category_no_icon_style">
|
|
| 12 | - <org.mozilla.fenix.settings.search.RadioSearchEngineListPreference
|
|
| 13 | - android:key="@string/pref_key_search_engine_list"
|
|
| 14 | - android:selectable="false"/>
|
|
| 15 | - </PreferenceCategory>
|
|
| 16 | - <PreferenceCategory
|
|
| 17 | - android:title="@string/preferences_category_select_private_search_engine"
|
|
| 18 | - android:selectable="false"
|
|
| 19 | - app:iconSpaceReserved="false"
|
|
| 20 | - android:layout="@layout/preference_category_no_icon_style">
|
|
| 9 | + app:iconSpaceReserved="false">
|
|
| 21 | 10 | <org.mozilla.fenix.settings.search.RadioSearchEngineListPreference
|
| 22 | 11 | android:key="@string/pref_key_private_search_engine_list"
|
| 23 | 12 | android:selectable="false"/>
|
| 24 | 13 | </PreferenceCategory>
|
| 25 | 14 | <PreferenceCategory
|
| 26 | 15 | android:selectable="false"
|
| 27 | - app:iconSpaceReserved="false"
|
|
| 28 | - android:layout="@layout/preference_category_no_icon_style">
|
|
| 16 | + app:iconSpaceReserved="false">
|
|
| 29 | 17 | <Preference
|
| 30 | 18 | android:key="@string/pref_key_add_search_engine"
|
| 31 | 19 | android:title="@string/search_engine_add_custom_search_engine_title"
|