Commit 4bd15158 authored by clairehurst's avatar clairehurst 🌱
Browse files

fixup! [android] Disable features and functionality

parent fd8a46ee

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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −14
Original line number Diff line number Diff line
@@ -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"