Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 87259ab2af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273 Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
This commit is contained in:
@@ -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>
|
||||
|
Reference in New Issue
Block a user