Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea343fa5 authored by Yomna Nasser's avatar Yomna Nasser Committed by Automerger Merge Worker
Browse files

Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: Ic40a46ce6d36e5147fc99ed3afb1bb1735164cad
parents 7efaff8d cf77b7a2

res/xml/mobile_network_settings.xml

+6 −6
Original line number Diff line number Diff line
@@ -241,6 +241,12 @@ 
            settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">

        </Preference>



        <SwitchPreference

            android:key="enable_2g"

            android:title="@string/enable_2g_title"

            android:summary="@string/enable_2g_summary"

            settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />



    </PreferenceCategory>



    <Preference
@@ -265,10 +271,4 @@ 
        settings:allowDividerAbove="true"

        settings:searchable="false"

        settings:controller="com.android.settings.network.telephony.NrDisabledInDsdsFooterPreferenceController"/>



    <SwitchPreference

        android:key="enable_2g"

        android:title="@string/enable_2g_title"

        android:summary="@string/enable_2g_summary"

        settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />

</PreferenceScreen>