Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd51805 authored by Yomna N's avatar Yomna N Committed by Android (Google) Code Review
Browse files

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

parents d9214f13 3e071f05

res/xml/cellular_security.xml

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
                "com.android.settings.network.telephony.CellularSecurityNotificationsPreferenceController"/>

    </PreferenceCategory>

    <PreferenceCategory

      android:key="cellular_security_encryption_divider"

      android:title="@string/cellular_security_settings_encryption_title"

      settings:controller="com.android.settings.network.telephony.CellularSecurityEncryptionDividerController">

        <SwitchPreferenceCompat

src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java

+0 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.settings.network.telephony;



import android.app.settings.SettingsEnums;

import android.os.Bundle;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;
@@ -44,10 +43,4 @@ public class CellularSecuritySettingsFragment extends DashboardFragment { 
    protected int getPreferenceScreenResId() {

        return R.xml.cellular_security;

    }



    @Override

    public void onCreatePreferences(Bundle bundle, String rootKey) {

        super.onCreatePreferences(bundle, rootKey);

        setPreferencesFromResource(R.xml.cellular_security, rootKey);

    }

}