PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing controller key and remove onCreatePreferences" into main

Browse Source
This commit is contained in:
Yomna N
2025-02-03 08:26:41 -08:00
committed by Android (Google) Code Review
parent d9214f1328 3e071f055e
commit 6cd518057a
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/cellular_security.xml
View File

@@ -34,6 +34,7 @@
"com.android.settings.network.telephony.CellularSecurityNotificationsPreferenceController"/> "com.android.settings.network.telephony.CellularSecurityNotificationsPreferenceController"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="cellular_security_encryption_divider"
android:title="@string/cellular_security_settings_encryption_title" android:title="@string/cellular_security_settings_encryption_title"
settings:controller="com.android.settings.network.telephony.CellularSecurityEncryptionDividerController"> settings:controller="com.android.settings.network.telephony.CellularSecurityEncryptionDividerController">
<SwitchPreferenceCompat <SwitchPreferenceCompat

7
src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.network.telephony; package com.android.settings.network.telephony;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
@@ -44,10 +43,4 @@ public class CellularSecuritySettingsFragment extends DashboardFragment {
protected int getPreferenceScreenResId() { protected int getPreferenceScreenResId() {
return R.xml.cellular_security; return R.xml.cellular_security;
} }
@Override
public void onCreatePreferences(Bundle bundle, String rootKey) {
super.onCreatePreferences(bundle, rootKey);
setPreferencesFromResource(R.xml.cellular_security, rootKey);
}
} }