Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae am: 27217b87a9 am: 58d85e3383

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: Ieb4b28cde2ec4b747ac55e57f4908c1cbf4ce340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gil Cukierman
2022-11-01 15:38:21 +00:00
committed by Automerger Merge Worker
parent 8205d3d591 58d85e3383
commit a69fc1784c
3 changed files with 139 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/mobile_network_settings.xml
View File

@@ -241,11 +241,13 @@
settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">
</Preference>
<SwitchPreference
<com.android.settingslib.RestrictedSwitchPreference
android:key="enable_2g"
android:title="@string/enable_2g_title"
android:summary="@string/enable_2g_summary"
settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />
settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController"
settings:useAdminDisabledSummary="true"
settings:userRestriction="no_cellular_2g"/>
<SwitchPreference
android:key="nr_advanced_calling"