Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273 Change-Id: I336dfff8e36549bc33431748f60fa88650a8ea01
This commit is contained in:
@@ -241,6 +241,12 @@
|
|||||||
settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">
|
settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">
|
||||||
</Preference>
|
</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>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
@@ -265,10 +271,4 @@
|
|||||||
settings:allowDividerAbove="true"
|
settings:allowDividerAbove="true"
|
||||||
settings:searchable="false"
|
settings:searchable="false"
|
||||||
settings:controller="com.android.settings.network.telephony.NrDisabledInDsdsFooterPreferenceController"/>
|
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>
|
</PreferenceScreen>
|
||||||
|
Reference in New Issue
Block a user