Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev

This commit is contained in:
Brad Ebinger
2020-03-04 18:05:25 +00:00
committed by Android (Google) Code Review
10 changed files with 681 additions and 7 deletions

View File

@@ -116,6 +116,13 @@
settings:keywords="@string/keywords_enhance_4g_lte"
settings:controller="com.android.settings.network.telephony.Enhanced4gAdvancedCallingPreferenceController"/>
<SwitchPreference
android:key="contact_discovery_opt_in"
android:title="@string/contact_discovery_opt_in_title"
android:persistent="false"
android:summary="@string/contact_discovery_opt_in_summary"
settings:controller="com.android.settings.network.telephony.ContactDiscoveryPreferenceController"/>
<ListPreference
android:key="preferred_network_mode_key"
android:title="@string/preferred_network_mode_title"