Merge "Specify correct location for Controllers in cellular_security.xml" into main

This commit is contained in:
Yomna Nasser
2024-06-10 17:41:30 +00:00
committed by Android (Google) Code Review

View File

@@ -25,17 +25,17 @@
<PreferenceCategory <PreferenceCategory
android:key="cellular_security_notifications_category" android:key="cellular_security_notifications_category"
android:title="@string/cellular_security_notifications" android:title="@string/cellular_security_notifications"
settings:controller="com.android.settings.network.CellularSecurityNotificationsDividerController"> settings:controller="com.android.settings.network.telephony.CellularSecurityNotificationsDividerController">
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="cellular_security_notifications" android:key="cellular_security_notifications"
android:title="@string/cellular_security_notifications_controller_title" android:title="@string/cellular_security_notifications_controller_title"
android:summary="@string/cellular_security_notifications_controller_summary" android:summary="@string/cellular_security_notifications_controller_summary"
settings:controller= settings:controller=
"com.android.settings.network.CellularSecurityNotificationsPreferenceController"/> "com.android.settings.network.telephony.CellularSecurityNotificationsPreferenceController"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="@string/cellular_security_settings_encryption_title" android:title="@string/cellular_security_settings_encryption_title"
settings:controller="com.android.settings.network.CellularSecurityEncryptionDividerController"> settings:controller="com.android.settings.network.telephony.CellularSecurityEncryptionDividerController">
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="require_cellular_encryption" android:key="require_cellular_encryption"
android:title="@string/require_cellular_encryption_title" android:title="@string/require_cellular_encryption_title"