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

This commit is contained in:
Yomna Nasser
2021-08-17 00:12:39 +00:00
committed by Android (Google) Code Review

View File

@@ -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>